Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,099 Commits 64 Branches 1,256 Tags
98e74b42e0a67caeaa7cda25587ac5dc932c19e9
Commit Graph

14099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer ef2a1f5929 chore: Update pageres 
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
 2016-03-23 08:16:39 -05:00
Blade Barringer fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Blade Barringer f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray 369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Blade Barringer 9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu 521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
Matteo Pagliazzi 23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite 
[v3] Added group reject invite route and initial tests
 2016-03-22 22:46:12 +01:00
Keith Holliday da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05:00
MathWhiz 86516b5e20 Update presskit 2016-03-22 08:41:02 -05:00
Blade Barringer 92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Blade Barringer 3add287a85 Merge branch 'khipkin-fix_class_change_gear_modal' into develop 2016-03-22 08:10:55 -05:00
MathWhiz c70b40e0a3 Add pull request instructions to CONTRIBUTING.MD 2016-03-22 07:59:13 -05:00
Blade Barringer bbcef441bf Adjust template instructions 2016-03-22 07:59:13 -05:00
mathwhiz a5b7066358 Add templates for issues and pull requests 2016-03-22 07:59:06 -05:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +01:00
Matteo Pagliazzi 85a05e0a99 Merge pull request #6938 from piousbox/api-v3-test-local-login-2 
local login test
 2016-03-21 22:50:37 +01:00
Matteo Pagliazzi f04d8d4d97 do not remove ops/fns from common/script/index.js until they have been ported everywhere 2016-03-21 22:50:18 +01:00
Victor Piousbox a03f34362c resolving conflicts 2016-03-21 21:28:07 +00:00
Victor Piousbox b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00:00
Victor Piousbox 5426d63a36 local login test 2016-03-21 21:26:04 +00:00
Matteo Pagliazzi d6fa16f86c skip tests that cannot be stubbed correctly 2016-03-21 22:22:26 +01:00
Victor Piousbox ddbb8a1beb invalid login credentials fixes 2016-03-21 21:10:17 +00:00
Keith Holliday a8e4455124 Added group reject invite route and initial tests 2016-03-21 15:42:38 -05:00
Matteo Pagliazzi 1d3c67af40 Merge pull request #6937 from piousbox/api-v3-delete-social-auth-test 
Api v3 delete social auth test
 2016-03-21 21:28:59 +01:00
Victor Piousbox fa079bd764 added those awaits for DELETE social user testing 2016-03-21 18:35:00 +00:00
Victor Piousbox 5f5fc754b0 local login test 2016-03-21 05:48:37 +00:00
Victor Piousbox 363e23b5e0 Merge branch 'api-v3-delete-social-auth-test' of github.com:piousbox/habitrpg into api-v3-delete-social-auth-test 2016-03-21 04:53:40 +00:00
Victor Piousbox ebcf913676 strengthen the test of password-reset just a little 2016-03-21 04:49:29 +00:00
Matteo Pagliazzi 0b5506b16b Merge pull request #6908 from piousbox/api-v3-password-reset 
api-v3 password reset
 2016-03-20 22:32:32 +01:00
Matteo Pagliazzi bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Victor Piousbox f73141f1f6 strengthen the test of password-reset just a little 2016-03-20 19:00:23 +00:00
Matteo Pagliazzi 480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +01:00
Matteo Pagliazzi fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01:00
Matteo Pagliazzi 657f19af0d add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy 2016-03-20 13:46:56 +01:00
Matteo Pagliazzi 2560096466 port buyQuest tests 2016-03-20 13:33:34 +01:00
Matteo Pagliazzi ad8834f4ed port tests for shared.ops.buyMysterySet.js 2016-03-20 13:12:06 +01:00
Matteo Pagliazzi 71f304786c add pickDeep utility function to pick nested properties from objects 2016-03-20 13:07:14 +01:00
Victor Piousbox ebbca3276e revert email.send() 2016-03-20 03:29:12 +00:00
Victor Piousbox 99cb8a07f7 reset password route 2016-03-20 02:54:52 +00:00
Victor Piousbox 6d972ea9af resolving conflicts 2016-03-20 02:53:58 +00:00
Victor Piousbox 3784f68dd8 mock for emailer for resetPassword route 2016-03-20 02:32:55 +00:00
Victor Piousbox d2c1c2cec6 cleanup and moving text strings to a locale object 2016-03-19 17:37:08 +00:00
Victor Piousbox e9a355a60b tests pass 2016-03-19 10:13:44 -07:00
Matteo Pagliazzi 957e1d26d6 add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy 2016-03-19 18:05:02 +01:00
Matteo Pagliazzi ff72706cae wip(shared): port buy ops and linked fns 2016-03-19 16:04:27 +01:00
Matteo Pagliazzi e68ebee980 temporarily skip challenge task deletion test 2016-03-19 13:10:40 +01:00
Matteo Pagliazzi 0a906da50c Merge pull request #6918 from TheHollidayInn/api-v3-challenge-task-score-tests 
Added tests for challenge task scoring and moved scoring code to model
 2016-03-19 12:08:37 +01:00
Kaitlin Hipkin 9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00