krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,119 Commits 63 Branches 1,225 Tags
82afc1971db745f159973a814123733a00c1c407
Commit Graph

79 Commits

Author SHA1 Message Date
Matteo Pagliazzi
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Matteo Pagliazzi
0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Matteo Pagliazzi
159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +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
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
fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01: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
219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Matteo Pagliazzi
490c6a9ae1 wip(shared): port sleep op 2016-03-15 16:33:44 +01:00
Matteo Pagliazzi
70df1137a0 fix statsComputed getter 2016-03-13 22:39:14 +01:00
Matteo Pagliazzi
8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Matteo Pagliazzi
05676d834e remove git conflict data 2016-03-10 17:13:13 +01:00
Matteo Pagliazzi
c39967767c Merge branch 'develop' into split-shared 2016-03-10 17:00:59 +01:00
Sabe Jones
cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Matteo Pagliazzi
986bfd8035 split remaining utilities from shared 2016-03-08 19:35:02 +01:00
Matteo Pagliazzi
bb6f0f4252 split user.fns 2016-03-08 18:58:39 +01:00
Matteo Pagliazzi
393a26e51a fix typo: reroll -> rebirth 2016-03-08 18:02:23 +01:00
Matteo Pagliazzi
eeebe4c342 wip: split shared ops 2016-03-07 23:02:42 +01:00
Matteo Pagliazzi
8437c21a51 start splitting ops (readCard has tests) 2016-03-07 19:32:49 +01:00
Matteo Pagliazzi
863ca9954e errors working with babel 6, export v3 shared modules in main common module 2016-03-05 18:58:40 +01:00
Blade Barringer
4cd0428f0a Merge branch 'develop' into api-v3 2016-03-04 12:16:22 -06:00
Blade Barringer
8c6d8163bc refactor: adjust path to cron module in common code 2016-03-03 18:09:07 -06:00
Blade Barringer
0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Matteo Pagliazzi
9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Phillip Thelen
762576e7a2 fix typo 2016-02-18 20:59:20 +01:00
Phillip Thelen
86181253c6 store reminders for tasks 2016-02-18 20:30:02 +01:00
Matteo Pagliazzi
e6b425d713 Revert "delete completed todos 30/90 days after completion" 
This reverts commit 0a9391ea75.
 2016-02-15 22:11:03 +01:00
Matteo Pagliazzi
28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Alys
e7c88d6e5d set purchased.plan.dateUpdated during cron if it hasn't been set - ref https://github.com/HabitRPG/habitrpg/issues/6682 2016-02-09 20:52:50 +10:00
Matteo Pagliazzi
0a9391ea75 delete completed todos 30/90 days after completion 2016-01-31 19:45:30 +01:00
Matteo Pagliazzi
914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening 
New history preening
 2016-01-09 20:12:33 +01:00
Matteo Pagliazzi
ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Matteo Pagliazzi
fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01:00
Blade Barringer
75f71bc2ca fix: Corrects stat allocation bug where it was possible to recieve more points than 100 
fixes #6434
 2016-01-05 08:35:40 -06:00
Alys
8db492099c Revert "fix(common): Corrects bug where stat points could be awarded after level 100" 
This reverts commit 2bbdf66d76.
 2016-01-05 07:05:40 +10:00
Alys
ece0de51cc Revert "assign correct number of attribute points after leveling up - fixes 6434" 
This reverts commit 53e2939ad9.
 2016-01-05 07:05:26 +10:00
Alys
53e2939ad9 assign correct number of attribute points after leveling up - fixes 6434 2016-01-05 06:31:43 +10:00
Blade Barringer
2bbdf66d76 fix(common): Corrects bug where stat points could be awarded after level 100 
Closes #6434
 2016-01-04 07:58:59 -06:00
Blade Barringer
ae9ec63229 Merge branch 'develop' into api-v3 2015-12-29 08:07:04 -06:00
Blade Barringer
bce049a316 Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2015-12-29 08:06:22 -06:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00