Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,757 Commits 64 Branches 1,256 Tags
d2ba8e223c71fa770344a73e1e182ce0f989b4ba
Commit Graph

1475 Commits

Author SHA1 Message Date
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 2b8846b803 Merge pull request #6748 from TheHollidayInn/api-v3-unsubscribe 
Added unsubscribe route and initial tests
 2016-02-22 18:03:05 +01: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
Keith Holliday 34b03934cc Added unsubscribe route and initial tests 2016-02-21 10:05:51 -06:00
Matteo Pagliazzi 2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Alys c95950c679 recompile spritesheets 2016-02-18 20:07:35 +10:00
Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
 2016-02-18 18:56:40 +10: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
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Blade Barringer d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Matteo Pagliazzi 28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Blade Barringer 4360f01936 feat(api-v3): Add force-start quest route 2016-02-12 08:09:16 -06:00
Matteo Pagliazzi 6cae147b83 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-leave 2016-02-11 20:48:18 +01:00
Matteo Pagliazzi e8a38a6326 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-abort 2016-02-11 20:44:27 +01:00
Matteo Pagliazzi 84d03dc2ad Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-cancel 2016-02-11 20:24:16 +01:00
Matteo Pagliazzi c79cb0efc6 update quest abort route 2016-02-11 15:32:25 +01:00
Matteo Pagliazzi 096bb3f853 Merge branch 'api-v3-quests-abort' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-abort 2016-02-11 15:16:29 +01:00
Matteo Pagliazzi c6c852cd6d Merge branch 'api-v3-quests-leave' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-leave 2016-02-11 14:52:09 +01:00
Matteo Pagliazzi 6c1950972b update quest cancel routes 2016-02-11 13:19:46 +01:00
Matteo Pagliazzi 3cd7e8ad5d Merge branch 'api-v3-quests-cancel' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-cancel 2016-02-11 12:54:34 +01:00
Matteo Pagliazzi 879506b38a update reject quest route 2016-02-11 12:50:28 +01:00
Matteo Pagliazzi 210a8ee11f Merge branch 'api-v3-quests-reject' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-reject 2016-02-11 12:12:09 +01:00
Matteo Pagliazzi a2af6c390b fix quest accept route and add tests 2016-02-10 22:27:59 +01:00
Alys e425e75b9d change Beast Master text from insanely to incredibly - partial fix for https://github.com/HabitRPG/habitrpg/issues/6685 2016-02-10 07:45:22 +10:00
Taldin b293d7acc2 Fixes #6356 (gryphon avatar clipping) 
Updated gryphon mount graphics.
 2016-02-09 10:27:10 -08: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
Alys 13c06756e3 Merge pull request #6586 from anowlcalledjosh/front_page_image_alts 
#6560: Add alt attributes for images on front page
 2016-02-09 18:15:47 +10:00
Alys badebe8bcc adjust rebirth description to specify that you must change class to buy class-specific gear 2016-02-09 11:52:07 +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
Alys 7aca788ce8 adjust subscription benefit task history information 2016-02-07 22:24:32 +10:00
Keith Holliday 6f606df211 Added quest abort route and initial tests 2016-02-04 15:22:37 -06:00
Alys 2d6a8e4b6a renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658 2016-02-05 06:55:29 +10:00
Keith Holliday 5ca663db57 Added quest leave route and initial tests 2016-02-04 12:31:38 -06:00
Keith Holliday 0684e30790 Added quest cancel route and initial tests 2016-02-03 17:04:57 -06:00
Keith Holliday d5148a7bf0 Added quest reject route and intial tests 2016-02-02 16:38:31 -06:00
Sabe Jones d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Alys a05f6c46d6 add name for mysterySet201601 (Champion of Resolution Set) - fixes https://github.com/HabitRPG/habitrpg/issues/6642 2016-02-02 15:48:28 +10: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
Alys ea57808176 remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed) 2016-01-31 18:25:37 +10:00
Alys 9b9072be45 removed mention of cookies from message about clearing local storage (cookies are not removed) 2016-01-31 18:16:26 +10:00
Blade Barringer a6ed635978 Merge branch 'api-v3-groups' into sabrecat/quest-accept 2016-01-30 11:10:33 -06:00
Alys 376e1b7491 Merge pull request #6617 from murraybd/develop 
Add in missing word your to passMan phrase.
 2016-01-30 08:49:08 +10:00
Brian Murray e48c47fbec Revert change to en_GB since the locales files don't get updated through 
GitHub.
 2016-01-29 14:20:06 -08:00
Sabe Jones b7ee6f7da0 fix(event): award old Robes to new users, not 2016 2016-01-29 15:12:07 -05:00
Brian Murray 2799905169 Add in missing word your to passMan phrase. 2016-01-29 11:37:51 -08:00