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,686 Commits 63 Branches 1,225 Tags
4e12cd293ce41f697c76b78e9f2824eb8343aa57
Commit Graph

773 Commits

Author SHA1 Message Date
Alys
3464914655 Revert "remove common/script/src" 
This reverts commit 7c5572608f.
 2016-03-01 05:30:44 +10:00
Matteo Pagliazzi
0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Matteo Pagliazzi
7c5572608f remove common/script/src 2016-02-29 16:35:35 +01:00
Matteo Pagliazzi
bb461f0c5a Merge branch 'develop' into api-v3 2016-02-26 10:08:24 +01:00
Sabe Jones
3270cbf89f fix(events): revert missed sprite and quest availability 2016-02-24 19:49:17 -05:00
Sabe Jones
ca57fad0b9 feat(time-travel): add Phoenixes 
Also adds Bailey news for the above and the subscriber set.
 2016-02-24 17:23:42 -05:00
Sabe Jones
5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05: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
Sabe Jones
e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Matteo Pagliazzi
35e6274cd6 Move cron and preening code to server, add support for quests in cron 2016-02-08 22:18:57 +01:00
Sabe Jones
d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Sabe Jones
0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Matteo Pagliazzi
0a9391ea75 delete completed todos 30/90 days after completion 2016-01-31 19:45:30 +01:00
Sabe Jones
b7ee6f7da0 fix(event): award old Robes to new users, not 2016 2016-01-29 15:12:07 -05:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Sabe Jones
c6d6e73ae6 feat(subscription): January 2016 mystery items 2016-01-26 15:20:55 -05:00
Phillip Thelen
8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06:00
David Barnett
7a29542815 Open links from task notes into new browser window/context (Fixes #5622) 2016-01-19 11:01:41 -08:00
Matteo Pagliazzi
ee854229c7 fix dateCompleted not remove from un-completed todos and fix tasks test 2016-01-18 15:01:46 +01:00
Blade Barringer
965c5dbaa7 Merge branch 'api-v3' into api-v3-groups 2016-01-16 19:46:47 -06:00
Blade Barringer
07f08de989 Merge branch 'improve_tests' into api-v3 2016-01-16 18:12:36 -06:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
9a908785c1 new history preening, save tasks after cron 2016-01-13 23:07:08 +01:00
Matteo Pagliazzi
e2edb974d7 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:40:04 +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
Alys
0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Matteo Pagliazzi
193e89a79e fix index when marking task as modified after history preening 2016-01-10 15:57:22 +01:00
Matteo Pagliazzi
1d0b05a6df fix typo in history preening 2016-01-09 21:17:17 +01:00
Matteo Pagliazzi
f55e4f65f9 Merge pull request #6483 from HabitRPG/new-history-preening 
fixes for new history preening, allow only 1 history entry per day in…
 2016-01-09 21:03:18 +01:00
Matteo Pagliazzi
b1a7e44722 fixes for new history preening, allow only 1 history entry per day in challenges tasks 2016-01-09 21:02:40 +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
Alys
58a92f626d Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug 
fix: Corrects stat allocation bug where it was possible to receive more points than 100
 2016-01-09 23:00:06 +10:00
Matteo Pagliazzi
82651cf1ed initial tests 2016-01-08 18:58:54 +01:00
Matteo Pagliazzi
ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Matteo Pagliazzi
243b839392 wip: new history preening, delineate process and differentiate between subscribers and non 2016-01-07 20:07:13 +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
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05: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
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05: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
874f319d95 fix: Corrects logic where it was possible to customize avatar 
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
 2016-01-03 10:41:44 -06:00