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

12710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi d79e0f6e2e add tests for hall 2016-02-18 19:41:35 +01:00
Matteo Pagliazzi 2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Matteo Pagliazzi 28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Matteo Pagliazzi 8b7719d25e fix apidoc comments 2016-02-14 12:56:40 +01:00
Matteo Pagliazzi 1eee27bdd4 Merge pull request #6374 from HabitRPG/api-v3-groups 
[API v3] Port groups, challenges and members
 2016-02-13 11:48:31 +01:00
Matteo Pagliazzi e1b01e3853 Merge pull request #6565 from HabitRPG/sabrecat/quest-accept 
WIP: Quests for API v3
 2016-02-12 20:56:19 +01:00
Sabe Jones 00f98d90b6 Merge pull request #6705 from HabitRPG/sabrecat/chat-cutoff 
No chat notifs from big Guilds
 2016-02-12 13:22:10 -06:00
Matteo Pagliazzi edaf3ef4db fix typo: 1028->1024 bytes 2016-02-12 19:50:50 +01:00
Matteo Pagliazzi 599510aa78 higher maxBuffer for integration tests 2016-02-12 19:49:53 +01:00
Sabe Jones b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Blade Barringer 4360f01936 feat(api-v3): Add force-start quest route 2016-02-12 08:09:16 -06:00
Sabe Jones a74279f629 Merge pull request #6702 from HabitRPG/sabrecat/fix-newbie-guild 
Don't send chat notifs for Newbies Guild
 2016-02-11 20:48:17 -06:00
Sabe Jones 67929f3a96 fix(performance): don't send chat notifs for Newbies Guild 2016-02-11 21:29:32 -05:00
Matteo Pagliazzi befdb189fc fix tests for quests routes 2016-02-11 21:09:14 +01:00
Matteo Pagliazzi f68b812b90 Merge branch 'TheHollidayInn-api-v3-quests-leave' into sabrecat/quest-accept 2016-02-11 20:48:26 +01: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 498bd31f10 Merge branch 'TheHollidayInn-api-v3-quests-abort' into sabrecat/quest-accept 2016-02-11 20:44:45 +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 7d86039a82 Merge branch 'TheHollidayInn-api-v3-quests-cancel' into sabrecat/quest-accept 2016-02-11 20:24:44 +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 a73d9af020 Merge pull request #6693 from HabitRPG/TheHollidayInn-api-v3-quests-reject 
Updated quest reject
 2016-02-11 20:18:25 +01:00
Sabe Jones fdd170c977 Merge pull request #6698 from HabitRPG/sabrecat/elastic-beanstalk 
AWS Elastic Beanstalk
 2016-02-11 11:38:12 -06:00
Matteo Pagliazzi 41c3276e66 fetch leader id when cancelling quest 2016-02-11 15:36:21 +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 ab187720a5 reject quest: test response 2016-02-11 15:14:07 +01:00
Matteo Pagliazzi dfb6ec2f48 cancel quest: test response 2016-02-11 15:11:38 +01:00
Matteo Pagliazzi 354b6bc39e update quest leave route 2016-02-11 15:07:45 +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 a998282c35 Merge pull request #6690 from HabitRPG/paglias/quest-accept 
Quest accept
 2016-02-11 12:02:37 +01:00
Sabe Jones 81098d5fe8 fix(static): update Android app image 2016-02-10 18:48:31 -05:00
Matteo Pagliazzi a2af6c390b fix quest accept route and add tests 2016-02-10 22:27:59 +01:00
Sabe Jones b228aa3f89 feat(elastic-beanstalk): deploy extensions 2016-02-10 16:24:24 -05:00
Matteo Pagliazzi fa14464a0c add accept quest route 2016-02-10 17:07:34 +01:00
Matteo Pagliazzi 95a3cea297 Merge pull request #6688 from crookedneighbor/blade-quest-start-tests 
start quest tests
 2016-02-10 16:10:18 +01:00
Matteo Pagliazzi 02a61e260b add tests for GET challenges/:challengeId 2016-02-10 16:10:00 +01:00
Blade Barringer 8ff4cfe709 tests: Finish start quest 2016-02-10 08:51:12 -06:00
Blade Barringer b6ed2f8c44 refactor: Move sleep function to seprate file 2016-02-10 08:21:36 -06: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
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
Matteo Pagliazzi 0b336d8012 add missing dot in field path 2016-02-08 23:40:03 +01:00
Matteo Pagliazzi 2f3ae32a0e finalize invite to quest route and startQuest method 2016-02-08 23:30:49 +01:00
Sabe Jones 884e3573a6 fix(deploy): junk commit for Heroku 2016-02-08 17:25:01 -05:00
Sabe Jones 75b95bfd67 Merge pull request #6681 from HabitRPG/sabrecat/pets-201602 
Monkey Pet Quest
 2016-02-08 15:30:55 -06:00