krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

2671 Commits

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
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
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
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
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
Keith Holliday
a8e4455124 Added group reject invite route and initial tests 2016-03-21 15:42:38 -05:00
Matteo Pagliazzi
bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Matteo Pagliazzi
480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +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
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
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
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
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Blade Barringer
e124b1a00b Merge pull request #6894 from TheHollidayInn/api-v3-development-controller 
Added development controller, middleware, and initial tests
 2016-03-18 16:06:10 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Keith Holliday
a3d7edd0c1 Renamed namespace to debug and added unit test for middleware 2016-03-18 14:05:14 -05:00
Keith Holliday
b46219adc5 Added tests for challenge task scoring and moved scoring code to model 2016-03-18 14:00:14 -05:00
Blade Barringer
5c3c8ebb74 refactor: Move auth update routes from user to auth controller 2016-03-18 07:35:29 -05:00
Blade Barringer
d1af7adff6 refactor: Update user update routes to be under auth namespace 2016-03-18 07:35:14 -05:00
Blade Barringer
22d25f8be3 fix: Change update user routes to use PUT instead of POST 2016-03-18 07:35:14 -05:00
Blade Barringer
22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug 
Inventory sorting debug
 2016-03-18 07:33:45 -05:00
Alys
fb338a00cb prevent quests being started in guilds 2016-03-18 08:38:32 +10:00
Victor Piousbox
4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Sabe Jones
ccdbdb2969 fix(seasonal-shop): choose quest more precisely 2016-03-17 13:13:21 -04:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
e056a62af0 refactor: Setup middleware for all development routes 2016-03-17 09:24:29 -05:00
Blade Barringer
6921c1694a feat: Allow routes to not need an async handler 2016-03-17 09:24:29 -05:00
Keith Holliday
6184fb5d24 Added development controller, middleware, and initial tests 2016-03-17 09:24:29 -05:00
Matteo Pagliazzi
7c005e7c68 fix typo in tests and increase sleep time 2016-03-17 15:20:41 +01:00
Blade Barringer
ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer
d4d668a7aa fix: Correct typo in equipment click 2016-03-17 08:09:37 -05:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Christopher Giroir
cfae524579 Updating button text to GET instead of VIEW 2016-03-16 23:23:36 -07:00
Sabe Jones
b4b0d7e89c chore(news): mobile updates Bailey 2016-03-17 00:09:42 -04:00
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland
a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00