Commit Graph

13495 Commits

Author SHA1 Message Date
Alys 2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Blade Barringer 4dd7c29baf fix: Add missing type param to equip call
closes #7212
2016-05-13 22:49:05 -05:00
Blade Barringer 38f09c7766 Merge pull request #7215 from crookedneighbor/fix_checklist
[API v3] Correct checklist on v3 client
2016-05-13 22:38:50 -05:00
Blade Barringer e19146d6be fix: Pin eslint to 2.9 2016-05-13 22:17:19 -05:00
Blade Barringer 0a8b8236c1 fix: Correct checklist on client
Closes #7207
2016-05-13 22:05:00 -05:00
Keith Holliday 1fd7df7521 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
2016-05-13 23:36:25 +02:00
Matteo Pagliazzi cc20812674 [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
2016-05-13 19:45:16 +02:00
Matteo Pagliazzi 468a312357 v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203) 2016-05-13 19:08:38 +02:00
Matteo Pagliazzi 199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Matteo Pagliazzi 486b93a3c9 mongoose: use options 2016-05-13 10:42:48 +02:00
Matteo Pagliazzi 9514e9c5a8 v3: fix reminders with no startDate 2016-05-13 10:34:09 +02:00
Matteo Pagliazzi 8183b0d084 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-13 10:31:49 +02:00
Blade Barringer afc51cbdc4 Merge pull request #7198 from crookedneighbor/capture_stack_trace
fix: Only apply captureStackTrace if it exists on the error object
2016-05-12 19:25:44 -05:00
Blade Barringer de1f2c2788 fix: Only apply captureStackTrace if it exists on the error object 2016-05-12 18:57:49 -05:00
Matteo Pagliazzi b5a7f8e3a1 test mongoose fix 2016-05-12 23:12:11 +02:00
Matteo Pagliazzi e47ae45f9f mongoose: increase keepAlive 2016-05-12 22:43:38 +02:00
Matteo Pagliazzi c7fb69b530 revert changes to mongoose config 2016-05-12 21:44:57 +02:00
Matteo Pagliazzi f1f18859de v3: fix todo scoring and try to fix production testing problem 2016-05-12 21:29:53 +02:00
Keith Holliday ca6dca5fd0 Fixed test broken by part sync change (#7195) 2016-05-12 19:55:34 +02:00
Matteo Pagliazzi bb1cb3397e v3 client: saving after syncing is complete 2016-05-12 18:18:24 +02:00
Keith Holliday 781f0bf1ab Api v3 task fixes (#7193)
* Update task view to use _id

* Added try catch to user service ops calls
2016-05-12 18:07:17 +02:00
Matteo Pagliazzi 93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Keith Holliday c9b7aa8342 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
2016-05-12 16:45:53 +02:00
Matteo Pagliazzi 7fea1d3a98 disable redirects 2016-05-12 14:07:05 +02:00
Matteo Pagliazzi 3f555b012d fix trailing spaces 2016-05-12 09:53:32 +02:00
Matteo Pagliazzi 8c351b6c56 return user.id and send analytics event before changing page 2016-05-12 09:40:21 +02:00
Matteo Pagliazzi 1dbd866ca1 Merge pull request #7189 from TheHollidayInn/api-v3-fixes
Api v3 fixes
2016-05-12 09:37:22 +02:00
Keith Holliday 01a8fde124 Fixed cron test 2016-05-11 23:40:20 -05:00
Keith Holliday 5d7ebd82a4 Updated party and group tests 2016-05-11 17:06:16 -05:00
Keith Holliday eff2f04b45 Add challenges to groups. Fixed isMemberOfGuild check 2016-05-11 14:34:36 -05:00
Keith Holliday 12eba7bbe9 Ensured login callback happens after user sync 2016-05-11 14:18:32 -05:00
Keith Holliday ee948f2447 Updated party query and create 2016-05-11 14:17:11 -05:00
Matteo Pagliazzi 679d56bc5c Merge pull request #7186 from TheHollidayInn/api-v3-registration-fix
Changed id param for registration response
2016-05-11 20:35:32 +02:00
Keith Holliday 5b490116db Changed id param for registration response 2016-05-11 10:40:40 -05:00
Matteo Pagliazzi bf2c69aaca v3: q -> bluebird 2016-05-11 16:57:43 +02:00
Matteo Pagliazzi a8f4731a0a Merge pull request #7091 from HabitRPG/api-v3-client
[API v3] Client
2016-05-11 16:36:22 +02:00
Matteo Pagliazzi 969459252b v3: do not await a non promise 2016-05-11 16:22:56 +02:00
Matteo Pagliazzi 8276ffcfe2 v3: fix tests 2016-05-11 16:21:22 +02:00
Matteo Pagliazzi 998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi 95aff08de3 v3 fix tests and use coroutines instead of regenerator 2016-05-11 15:59:18 +02:00
Matteo Pagliazzi bcb2877f61 Merge pull request #7145 from TheHollidayInn/api-v3-client-user-service
[WIP] Ported User Serivce to client side and to api v3
2016-05-11 15:50:09 +02:00
Keith Holliday 2e2aa55fc5 Removed extra consoles.log. Changed data.data to res.data 2016-05-11 08:27:35 -05:00
Matteo Pagliazzi 84b198f17f v3 fix tests with deferred 2016-05-11 14:55:51 +02:00
Matteo Pagliazzi a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Matteo Pagliazzi cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Matteo Pagliazzi 299ed624f5 v3: upgrade some deps 2016-05-11 13:48:39 +02:00
Matteo Pagliazzi 0d4870b1e6 v3: remove newrelic config file in favour of env variables 2016-05-11 11:43:50 +02:00
Keith Holliday f807bc2a49 Fixed auth tests. Updated Authctrl response 2016-05-10 22:09:04 -05:00
Matteo Pagliazzi f46b336a1f v3: fix package.json 2016-05-11 01:33:49 +02:00
Matteo Pagliazzi 17e763db37 v3: fix package.json 2016-05-11 01:32:55 +02:00