Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,654 Commits 64 Branches 1,256 Tags
5e30aeb24c7f3d32e337059e09afa911e79e8a2b
Commit Graph

693 Commits

Author SHA1 Message Date
Matteo Pagliazzi c6da283b54 v3: fix build and ios IAP 2016-05-19 21:18:43 +02:00
Matteo Pagliazzi e98930cd4a v3: limit fields of challenge tasks that can be updated 2016-05-18 23:27:49 +02:00
Matteo Pagliazzi 65c739f7de v3: misc fixes for payments 2016-05-18 22:35:03 +02:00
Matteo Pagliazzi f0f67e1e88 v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails 2016-05-18 18:29:38 +02:00
Matteo Pagliazzi ef9dc9a15a v3: fix tests for challenge export 2016-05-18 17:49:17 +02:00
Blade Barringer 93d50e4f60 fix: Correct get tasks route to properly get todos (#7349) 2016-05-18 16:54:02 +02:00
Matteo Pagliazzi a757df9f5b v3: fix notifications 2016-05-17 19:12:39 +02:00
Alys 1cf2c89171 adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321) 2016-05-17 15:48:58 +02:00
Alys 810e4cbd78 completed To-Dos: return the 30 most recent instead of 30 oldest (#7318) 2016-05-17 08:13:47 +02:00
Blade Barringer 4672fd3b0b Merge branch 'api-v3' into Alys-v3-armoire-fix 2016-05-16 14:10:39 -05:00
Blade Barringer 4d98aa2d89 Merge branch 'Alys-v3-buy-health-potion' into api-v3 2016-05-16 14:06:02 -05:00
Keith Holliday dbd6daeca0 Updated task model to allow setting streak (#7306) 2016-05-16 20:12:46 +02:00
Alys cfb5e2be60 fix bug in Rebirth test, add new tests, adjust apidocs (#7293) 2016-05-16 18:13:49 +02:00
Alys daa0955ac1 rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error 2016-05-16 23:15:01 +10:00
Alys b676fc0b71 fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion 2016-05-16 16:21:24 +10:00
Blade Barringer 6bbfbbf613 fix: Fix quest progress button 2016-05-15 21:17:11 -05:00
Blade Barringer 21203c3f2e feat: Add modify inventory debug menu 2016-05-15 16:07:30 -05:00
Blade Barringer 2851af1a29 chore: Disable make admin debug route for v3 prod testing 2016-05-15 07:01:09 -05:00
Blade Barringer 44c9449913 feat: Separate out update-user into set-cron and make-admin debug routes 2016-05-15 06:58:54 -05:00
Blade Barringer 480937c800 fix: Temporarilly comment out udpate user debug route 2016-05-14 23:07:18 -05:00
Blade Barringer 7b15967215 Merge pull request #7263 from crookedneighbor/debug-update-user 
Debug update user
 2016-05-14 22:48:20 -05:00
Blade Barringer 4a2e3d4410 lint: Add missing semicolons in test 2016-05-14 22:45:35 -05:00
Blade Barringer 3b8ce8451b feat: Create debug update user route 2016-05-14 22:30:18 -05:00
Alys 887d187691 change "an user" to "a user" in comments and text (no code changes) (#7257) 2016-05-15 01:10:08 +02:00
Blade Barringer c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename 
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
 2016-05-14 10:19:43 -05:00
Blade Barringer 9969aa667a fix: Remove requirement on message paramter in transfer-gems 2016-05-14 07:37:47 -05:00
Alys 44e9d8b09e fix tests for /members/transfer-gems 2016-05-14 07:18:00 -04:00
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
Alys fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10: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 93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Keith Holliday 01a8fde124 Fixed cron test 2016-05-11 23:40:20 -05: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 84b198f17f v3 fix tests with deferred 2016-05-11 14:55:51 +02:00
Matteo Pagliazzi cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Keith Holliday 632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi 1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +02:00
Matteo Pagliazzi 03008c0d40 Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-09 23:29:38 +02:00
Keith Holliday 20f9bbf449 Corrected reset checklist logic (#7154) 
* Corrected reset checklist logic

* Change cron logic to reset rather than set

* Remove extra paranthesis
 2016-05-09 23:06:27 +02:00
Matteo Pagliazzi e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Blade Barringer 7d41b76b2e Merge pull request #7148 from crookedneighbor/require-again 
feat: Add require-again to help with unit testing
 2016-05-06 12:20:19 -05:00
Blade Barringer 192488cb02 feat: Add require-again to help with unit testing 2016-05-06 12:05:06 -05:00
Matteo Pagliazzi 21d798bca7 v3: GET /groups accept a guilds type which returns all the guilds the user is a member of 2016-05-03 15:49:47 +02:00