Commit Graph

1011 Commits

Author SHA1 Message Date
Husman 4a3e0eb884 Removing accepted guild invitations from the local copy of the user object so the notification goes away without having to refresh. #7600 2016-06-12 16:03:44 -07:00
Husman 9b12d46741 feat: Add group by button to equipment page
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
2016-06-12 09:40:25 -05:00
Shervin Sarain 539547b39e prevent sync from clearing selected tags (#7631)
* prevent sync from clearing selected tags

* improved tag selection bugfix
2016-06-11 19:57:20 +02:00
MathWhiz 57bb4d8c10 Fix webhooks (#7622)
* fix userServices.js

* comply with eslint

* Remove conversion to string
2016-06-10 12:42:48 +02:00
Matteo Pagliazzi efeb2c1c8e implement tips for loading screen (#7632)
* implement tips for loading screen

* fix typo in tip 22
2016-06-10 12:25:09 +02:00
Blade Barringer b97d7cc9f9 feat: Disable spells on client when they cannot be cast
Closes #7110
Closes #6867
2016-06-09 08:58:57 -05:00
Blade Barringer 17b6999c81 Merge pull request #7621 from crookedneighbor/party_page
Fetch Party when going to party page
2016-06-07 21:43:38 -05:00
Sabe Jones 9df3e88842 fix(coupons): POST apply, not GET 2016-06-08 01:52:21 +00:00
Matteo Pagliazzi 5e01b3d129 fix sticky header not working 2016-06-07 21:12:31 +02:00
Blade Barringer 5beb6106c9 fix: Go to loaded party page when inviting friends to party 2016-06-07 12:36:07 -05:00
Matteo Pagliazzi f7be7205e7 Remove localstorage and add notifications (#7588)
* move remaining files frm /common/script/public to website/public

* remove localstorage

* add back noscript template and put all javascript in the footer

* fixes client side tests

* remove double quotes where possible

* simplify jade code and add tests for buildManifest

* loading page with logo and spinner

* better loading screen in landscape mode

* icon on top of text logo

* wip: user.notifications

* notifications: simpler and working code

* finish implementing notifications

* correct loading screen css and re-inline images

* add tests for user notifications

* split User model in multiple files

* remove old comment about missing .catch()

* correctly setup hooks and methods for User model. Cleanup localstorage

* include UserNotificationsService in static page js and split loading-screen css in its own file

* add cron notification and misc fixes

* remove console.log

* fix tests

* fix multiple notifications
2016-06-07 16:14:19 +02:00
Blade Barringer 48957369f3 fix: Prevent group not found message when reloading party page 2016-06-07 08:52:28 -05:00
Blade Barringer 3f8ab017ce fix: Prevent tavern from syncing every time a user goes to the tavern page 2016-06-07 08:52:01 -05:00
Blade Barringer 006b074ac2 Merge branch 'develop' into party_page 2016-06-07 07:59:59 -05:00
Blade Barringer 3113e1a1e8 fix: Correct text color in not due tasks
Closes #7605
2016-06-04 17:59:57 -05:00
Blade Barringer 95340da5e2 fix(css): Correct css where due tasks could not be editted 2016-06-04 07:52:35 -05:00
Blade Barringer 8c81e02a87 refactor: Use stateChange hook for releasing keybinding 2016-06-03 21:33:15 -05:00
Blade Barringer 7536ba7aa2 Merge branch 'develop' into Sinble-bug/slow_chat 2016-06-03 17:24:52 -05:00
MathWhiz d072da3345 feat: change opacity of emoji in completed tasks
Closes #7184
2016-06-03 12:39:12 -05:00
Shervin Sarain 8c92ee6876 fix: correct param in tag sorting
Fixes #7593
2016-06-03 12:29:44 -05:00
Blade Barringer 52f0057c3d fix: Remove unnecessary flags.contributor property from user
Closes #7550
2016-05-31 21:10:58 -05:00
Sabe Jones fcc14520c5 Don't $watch drops (#7547)
* WIP(drops): get drops out of _tmp

* fix(notifications): no watch for drops/mystery

* fix(ops): only two response values

* fix(test): update op expectation
Also update API docs for modified route.

* fix(lint): remove trailing space

* fix(test): update integration check
2016-05-31 14:56:33 -05:00
Sabe Jones 9b56c6f2ba Don't persist properties of tag filters (#7564)
* fix(filters): don't persist tag props
Partial fix for #7412

* fix(test): correct expectation
2016-05-31 14:55:59 -05:00
Lucas F T Hennigen 0b122f3b43 fix(tags): Fix tag removal functionality (#7553)
Tag removal functionality was broken. Turns out the issue was simply
that we weren't removing the tag from the local `task` object, so the
tag was removed, but readded upon sync/pressing save.

Closes #7412
2016-05-31 14:55:30 -05:00
Blade Barringer b1a2632319 fix: Use === in comparison 2016-05-30 17:22:53 -05:00
Lucas Torroba (@zesme) b20f5545b9 Cleanup add checklist item function
Cleaned up `addChecklistItem` function, shortening it
2016-05-27 10:41:15 -03:00
Lucas Torroba (@zesme) 46be1553f0 Close #7493 2016-05-27 10:41:15 -03:00
Blade Barringer 7075cf671d fix: Omit chat when sending group update call
Closes #7200
2016-05-25 20:19:15 -05:00
Sabe Jones 8ca3144563 fix(crit): notify from server response (#7498)
Fixes #3166.
2016-05-25 16:17:24 -05:00
Matteo Pagliazzi 042ac16c48 client: fetch all challenges members 2016-05-25 12:41:24 +02:00
Blade Barringer 0008839996 Merge pull request #7475 from crookedneighbor/armoire_sync_fix
Fix Armoire returns wrong equipment bug
2016-05-24 21:02:02 -05:00
Keith Holliday 048d55b962 Removed sync call on load (#7485) 2016-05-24 22:41:38 +02:00
Blade Barringer 35544f14c5 fix: Armoire sends back data from server rather than relying on client
closes #5376
2016-05-24 07:13:09 -05:00
Blade Barringer f1286762a8 Merge branch 'TheHollidayInn-tasks-delete-checklist' into develop 2016-05-23 21:19:01 -05:00
Blade Barringer 770ffe93fc fix: Prevent task cloning from cloneing challenge object
fixes #7435
closes #7451
2016-05-23 21:13:35 -05:00
Keith Holliday d4287e1fd8 Added sync with user adds checklist item. Prevented task checklist remove request from being called on blank checklist 2016-05-23 23:34:45 +01:00
Keith Holliday 80323120b6 Updated hall service and updated hall controller 2016-05-23 21:32:43 +01:00
Blade Barringer 0b87777e26 feat: Show loading state on party page when party isn't ready 2016-05-23 07:15:46 -05:00
Blade Barringer 0d2aa4e43a fix: Fetches the party in the header on initial party page load
If the party page is refreshed, the header wasn't populating. This
fetches the party in the header _and_ the party page
2016-05-23 07:13:53 -05:00
Matteo Pagliazzi 28f2e9c356 API v3 [WIP] (#6144)
* Fixed more tests

* Added tags into user service

* Added api-v3 auth urls

* v3: fix package.json

* v3: fix package.json

* Fixed auth tests. Updated Authctrl response

* v3: remove newrelic config file in favour of env variables

* v3: upgrade some deps

* switch from Q to Bluebird

* v3 fix tests with deferred

* Removed extra consoles.log. Changed data.data to res.data

* v3 fix tests and use coroutines instead of regenerator

* v3: fix tests

* v3: do not await a non promise

* v3: q -> bluebird

* Changed id param for registration response

* Updated party query and create

* Ensured login callback happens after user sync

* Add challenges to groups. Fixed isMemberOfGuild check

* Updated party and group tests

* Fixed cron test

* return user.id and send analytics event before changing page

* fix trailing spaces

* disable redirects

* Api v3 party tavern fixes (#7191)

* Added check if user is in party before query

* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites

* Update tavern ctrl to use new promise

* v3: misc fixes

* Api v3 task fixes (#7193)

* Update task view to use _id

* Added try catch to user service ops calls

* v3 client: saving after syncing is complete

* Fixed test broken by part sync change (#7195)

* v3: fix todo scoring and try to fix production testing problem

* revert changes to mongoose config

* mongoose: increase keepAlive

* test mongoose fix

* fix: Only apply captureStackTrace if it exists on the error object

* v3: fix reminders with no startDate

* mongoose: use options

* chore(): rename website/src -> website/server and website/public -> website/client (#7199)

* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203)

* [API v3] Fix calls to user.ops and deleting tags (#7204)

* v3: fixes calls to user.ops from views and deleting tags

* v3: fix tests that use user._statsComputed

* Api v3 fixes continued (#7205)

* Added timzeone offset back

* Added APIToken back to settings page

* Fixed fetch recent messages for party

* Fixed returning group description

* Fixed check if user is member of challenge

* Fixed party members appearing in header

* Updated get myGroups param to include public groups. Fixed isMemberOf group

* Fixed hourglass purchase

* Fixed challenge addding tasks on first creating

* Updated tests to accomidate new changes

* fix: Correct checklist on client

Closes #7207

* fix: Pin eslint to 2.9

* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions

* fix: Add missing type param to equip call

closes #7212

* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges

* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227

* fix tests for /members/transfer-gems

* fix: Set gems sent notification as translatable string

* chore: Remove unusued variable

* fix: Remove requirement on message paramter in transfer-gems

* add a missing variable declaration

* chore: clarify comments on cron code

* fix: Correct client request from habitrpg -> tavern

* update apidoc URL in package.json

Closes #7222

* Fixed start party by invites

* Updated spell casting to v3

* Fixed adding and removing tags on tasks

* Fixed page reload on settings change

* Fixed battle monsters with friends button

* Loaded completed todos when done is clicked

* chore: Reinstate floating version number for eslint

babel-eslint regression fixed

* Fixed reload tests

* change "an user" to "a user" in comments and text (no code changes) (#7257)

* fix: Alert user that drops were recieved

* remove userServices.js from karma.conf - it's been moved to website/client/js/services

* feat: Create debug update user route

* fix: Correct set cron debug function

* feat: Add make admin button to debug menu

* lint: Add missing semicolons in test

* fix: Temporarilly comment out udpate user debug route

* v3: fix _tmp for crit and streakBonus

* v3: execute all actions when leaving a solo party

* v3 client: fix group not found when leaving party

* v3 migration: fix challenge prize

* v3 cron: only save modified tasks

* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons

* v3: fix tasks chart

* v3 client: fix ability to leave challenge

* v3 client: fix filtering by tag and correctly show tag tooltip

* v3 common: fix tags tests

* v3 client: support unlinking not found challenges tasks

* v3: disable Bluebird warning for missing return, fixes #7269

* feat: Separate out update-user into set-cron and make-admin debug routes

* chore: Disable make admin debug route for v3 prod testing

* v3: misc fixes

* v3: misc fixes

* v3: fix adding multiple tasks

* Fixed join/leave button updates

* Queried only user groups to be available when creating challenges

* Fixed bulk add tasks to challenge

* Synced challenge tasks after leave and join.

* Fixed default selected group

* Fixed challenge member info. Fixed challenge winner selection

* Fixed deleting challenge tasks

* Fixed particiapting filter

* v3 client: fix casting spells

* v3: do not log sensitive data

* v3: always save user when casting spell

* v3: always save user when casting spell

* v3: more fixes for spells

* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282)

* v3: add TODO for client side spells

* feat: Add modify inventory debug menu

* Fixed viewing user progress on challenge

* Updated tests

* fix: Fix quest progress button

* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion

* v3: fix stealth casting

* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)

* v3: fix auto allocation

* v3 client: misc fixes

* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error

* Added delete for saved challenge task

* Fixed member modal on front page

* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298)

* fix bug in Rebirth test, add new tests, adjust apidocs (#7293)

* Updated task model to allow setting streak (#7306)

* fix: Correct missing * in apidoc comments

* Api v3 challenge fixes (#7287)

* Fixed join/leave button updates

* Queried only user groups to be available when creating challenges

* Fixed bulk add tasks to challenge

* Synced challenge tasks after leave and join.

* Fixed default selected group

* Fixed challenge member info. Fixed challenge winner selection

* Fixed deleting challenge tasks

* Fixed particiapting filter

* Fixed viewing user progress on challenge

* Updated tests

* Added delete for saved challenge task

* v3: fix sorting

* [API v3] add CRON_SAFE_MODE (#7286)

* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO

* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161

* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment

* fix check for CRON_SAFE_MODE

* v3 client: fix typo

* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons

* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318)

* v3 migration: fix createdAt date

* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)

* v3: fix unlinking multiple tasks

* v3 fix releasing pets

* v3: fix authenticating with apiUrl

* v3: fix typo

* v3 fix client tests for unlinking

* v3 client: do not show start quest button when quest is active

* v3 client: fix ability to send cards

* v3 client: fix misc challenge issues

* v3: fix notifications

* v3 client: more user friendly errors

* v3 client: only load completed todos once

* v3 client: fix tests

* v3: move TAVERN_ID to common code

* fix: Provide default type and text for new task creation in score route

* fix: Provide default history [] for habit in score route

* fix: Add _legacyId prop to tasks to support non-uuid identifiers

* chore: Change v3 migration to use _legacyId instead of legacyId

* fix: check for _legacyId in tasks if id does not exist

* refactor: Extract out finding task by id or _legacyId into a function

* Api v3 party quest fixes (#7341)

* Fix display of add challenge message when group challenges are empty

* Fixed forced quest start to update quest without reload

* Fixed needing to reload when accepting party invite

* Fix group leave and join reload

* Fixed leave current party and join another

* Updated party tests

* v3 client: remove console.log statement

* v3: misc fixes

* v3 client: fix predicatbale random

* v3: info about API v3

* v3: update footer with links to developer resources

* v3: support party invitation from email

* v3 client: fix chat flagging

* fix: Correct get tasks route to properly get todos (#7349)

* move locales strings from api-v3.json to other locales files (#7347)

* move locales strings from api-v3.json: authentication strings -> front.json

* move locales strings from api-v3.json: authentication strings -> tasks.json

* move locales strings from api-v3.json: authentication strings -> groups.json

* move locales strings from api-v3.json: authentication strings -> challenge.json

* move locales strings from api-v3.json: authentication strings -> groups.json (again)

* move locales strings from api-v3.json: authentication strings -> quests.json

* move locales strings from api-v3.json: authentication strings -> subscriber.json

* move locales strings from api-v3.json: authentication strings -> spells.json

* move locales strings from api-v3.json: authentication strings -> character.json

* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)

* move locales strings from api-v3.json: authentication strings -> npc.json

* move locales strings from api-v3.json: authentication strings -> pets.json

* move locales strings from api-v3.json: authentication strings -> miscellaneous

* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json

* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup

* v3 client: fix sticky header

* v3: remove unused code

* v3 client: correctly redirect after inviting

* Removed v2 calls from views (#7351)

* v3: fix tests for challenge export

* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails

* Added force cache update when fetching new messages (#7360)

* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data

* v3: misc fixes for payments

* v3: limit fields of challenge tasks that can be updated

* fix(tests): never connect to NODE_DB_URI for tests

* Added new route for setting last cron and updated front end

* v3: fix iap url

* v3: fix build and ios IAP

* Changed route to user set custom day start

* v3: iap accessible under /api/v3, fixes to spells and groups invitations

* v3: correctly use v3 routes in client

* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246

* use natural language for error message about skills on challenge tasks (#7336), fix other gramatical error

* Updated ui when user rejects a guild invite (#7368)

* feat: complete custom day start route

Closes #7363

* fix: Correct spelling of healAll skill

fix: Correct sprite name of healAll skill

* fix: Change all instances of spookDust -> spookySparkles

* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386)

* add plumilla to artists for Tangle Tree in Bailey message

* Fixed quest drop modal (#7377)

* Fixed quest drop modal

* Fixed broken party test

* [API v3] Maintenance Mode (#7367)

* WIP(maintenance): maintenance

* WIP(maintenance): working locale features

* fix(maintenance): don't translate info page target

* WIP(maintenance): start adding info page

* fix(maintenance): linting

* feat: Add container to maintenance info page

* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages

* fix(maintenance): linting

* refactor(maintenance): further slim down variables

* refactor: Remove unnecessary variables

* fix: Correct string interpolation in maintenace view

* feat: Dynamically add time to maintenance pages

* maintenance mode: do not connect to mongodb

* fix(maintenance): clean up timezones etc.

* fix(maintenance): remove unneeded sprite

* Tavern party challenges invites fix (#7394)

* Added challenges and invitations to party

* Loaded tavern challenges

* Updated group and quest services tests

* v3: implement automatic syncing if user is not up to date

* Removed unnecessary fields when updating groups and challenges (#7395)

* v3: do not saved populated user

* v3: correctly return user subset

* Chained party promises together (#7396)

* v3: $w -> splitWhitespace

* use bluebird

* use babel polyfill

* migration: fix items

* update links for v3

* Updated shortname validation to support multiple browsers

* Docs changes (#7401)

* chore: Clarify transfer-gems documentation

* chore: Clarify api status route documentation

* chore: Mark webhooks as BETA

* Added tags update route. Added sort to user service (#7381)

* Added tags update route. Added sort to user service

* Change update tasks route to reorder tasks

* Fixed linting issue

* Changed params for reorder tags route

* Fixed not found tag and added test

* Added password confirmation when deleteing account (#7402)

* fix production logging

* feat(commit): push

* empty commit

* feat(maintenance): post-downtime news & awards (#7406)

* fix exporting avatar

* second attempt at fixing exporting avatar

* fix production logging

* s3: convert moment to date instance

* fix avatar sharing and caching (30 minutes)

* fix: Correct missing parameter

Closes #7433

* fix: Validate challenge shortname on server

* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 13:58:31 +02:00
Keith Holliday 63de1e398f Added force sync param to party and tavern requests 2016-05-23 09:40:04 +01:00
Blade Barringer c5215e80de Merge branch 'TheHollidayInn-api-v3-challenge-shortname-validation' into api-v3 2016-05-22 20:58:23 -05:00
Keith Holliday 1a19c9d2a6 Added password confirmation when deleteing account (#7402) 2016-05-22 03:55:52 +02:00
Keith Holliday e3c79fbdfa Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service

* Change update tasks route to reorder tasks

* Fixed linting issue

* Changed params for reorder tags route

* Fixed not found tag and added test
2016-05-22 03:55:45 +02:00
Keith Holliday c9eebf0b84 Updated shortname validation to support multiple browsers 2016-05-22 02:20:25 +01:00
Keith Holliday 25511a8e64 Chained party promises together (#7396) 2016-05-21 19:46:38 +02:00
Keith Holliday d6e7eb8c75 Removed unnecessary fields when updating groups and challenges (#7395) 2016-05-21 18:45:08 +02:00
Matteo Pagliazzi c44c2a35ba Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-21 18:43:59 +02:00
Matteo Pagliazzi b49826129a v3: implement automatic syncing if user is not up to date 2016-05-21 18:43:35 +02:00
Keith Holliday b378e41f2c Tavern party challenges invites fix (#7394)
* Added challenges and invitations to party

* Loaded tavern challenges

* Updated group and quest services tests
2016-05-21 17:26:34 +02:00