krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,280 Commits 63 Branches 1,225 Tags
f7027b5cf36ced12e6af6b66af0846ef48f72b4d
Commit Graph

558 Commits

Author SHA1 Message Date
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -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
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
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
Blade Barringer
146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Matteo Pagliazzi
b948fc031f fix typo in common code 2016-03-13 21:12:19 +01:00
Matteo Pagliazzi
6fa23ae49f make sure to clone drop so original properties do not change 2016-03-11 19:11:46 +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
d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603 
Pet quest March 2016
 2016-03-09 15:11:14 -06: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
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Matteo Pagliazzi
986bfd8035 split remaining utilities from shared 2016-03-08 19:35:02 +01:00
Blade Barringer
155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06: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
a351cb5f4e change references to imported libs 2016-03-08 17:49:18 +01:00
Matteo Pagliazzi
5a2daabada remove all changes from eslint --fix 2016-03-08 17:45:14 +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
Blade Barringer
511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel 
chore: upgrade babel to v6
 2016-03-04 08:36:08 -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
Alys
c3107ad3fb improve commenting style 2016-03-03 13:35:55 +10:00
Alys
56e53cc95f fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching 2016-03-03 08:30:49 +10:00
Matteo Pagliazzi
5b012750bb convert spells to es6 2016-03-02 12:46:06 +01:00
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Blade Barringer
c96ddaeebe refactor: Remove unused common script src files 2016-03-01 08:49:25 -06:00
Alys
3464914655 Revert "remove common/script/src" 
This reverts commit 7c5572608f.
 2016-03-01 05:30:44 +10:00
Matteo Pagliazzi
7c5572608f remove common/script/src 2016-02-29 16:35:35 +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
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
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
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
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00