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

1429 Commits

Author SHA1 Message Date
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
Matteo Pagliazzi 35e6274cd6 Move cron and preening code to server, add support for quests in cron 2016-02-08 22:18:57 +01:00
Keith Holliday 6f606df211 Added quest abort route and initial tests 2016-02-04 15:22:37 -06: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
Blade Barringer a6ed635978 Merge branch 'api-v3-groups' into sabrecat/quest-accept 2016-01-30 11:10:33 -06:00
Matteo Pagliazzi f16b605c37 add update challenge with tests 2016-01-27 12:22:24 +01:00
Keith Holliday c498eef21c Added initial chat delete tests 2016-01-23 23:09:22 -06:00
Sabe Jones 0ec63ca68d test(quests): invite and accept WIP 2016-01-22 16:59:34 -05:00
Sabe Jones 3bd806a0f0 test(quests): accept route WIP 2016-01-21 17:31:54 -05:00
Blade Barringer 66083f766c Merge branch 'api-v3' into api-v3-groups 2016-01-18 18:04:20 -06:00
Blade Barringer 32a2b3121e Merge branch 'develop' into api-v3 2016-01-18 18:04:07 -06:00
Sabe Jones c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks 
Text and visual tweaks for Gems
 2016-01-18 15:25:58 -06:00
Alys fe58129cd3 remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908 2016-01-19 06:18:49 +10:00
Alys fd62e39f20 fix spelling mistake: crystaline -> crystalline 2016-01-19 04:47:50 +10:00
Matteo Pagliazzi ee854229c7 fix dateCompleted not remove from un-completed todos and fix tasks test 2016-01-18 15:01:46 +01:00
Kristian Tashkov f37b5a7fac Challenges join route and tests 2016-01-17 15:44:15 -06:00
Matteo Pagliazzi 8de8ca7e18 add getChallengeMemberProgress route and misc fixes 2016-01-17 12:01:57 +01:00
Matteo Pagliazzi c27f98075c Merge branch 'api-v3-groups' into api-v3-members 2016-01-17 11:24:10 +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
Matteo Pagliazzi f447af19ae add tests for getting challenge members and fix a lot of bugs 2016-01-16 16:18:06 +01:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Matteo Pagliazzi e0b10d44ca Merge branch 'api-v3-groups' into api-v3-members 2016-01-15 11:22:11 +01:00
Luveluen 5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Blade Barringer d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Matteo Pagliazzi 5206469e90 add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks) 2016-01-14 19:46:43 +01:00
Matteo Pagliazzi 2b9aa11598 Merge branch 'api-v3-groups' into api-v3-challenges-tasks 2016-01-14 18:25:59 +01: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 6f6d4edcec Merge branch 'api-v3-groups' into api-v3-members 2016-01-13 18:41:53 +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
Sabe Jones 81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00