Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,099 Commits 64 Branches 1,256 Tags
98e74b42e0a67caeaa7cda25587ac5dc932c19e9
Commit Graph

14099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Alys 2e79c5b5b8 create script to mark the Enchanted Arrmoire as not being empty for users who logged in recently and who do not have all gear 2016-02-07 16:07:33 +10:00
Sabe Jones a3251ac9a0 fix(groups): DRY profile name logic 2016-02-05 15:26:15 -05:00
Sabe Jones dd3918436f fix(groups): don't show HP in Guilds 2016-02-05 15:19:23 -05:00
Blade Barringer 3b9c921c2f feat(api-v3): First iteration of quest invite 2016-02-05 10:26:06 -06:00
Blade Barringer 03c9c2933f feat(api-v3): finish first iteration of group.startQuest method 2016-02-05 09:29:46 -06:00
Matteo Pagliazzi 1e433290d2 Merge pull request #6665 from HabitRPG/paglias/quests-methods 
API v3 - Group model methods
 2016-02-05 11:14:12 +01:00
Matteo Pagliazzi 18958bde5a review and fix group model methods 2016-02-05 11:06:40 +01:00
Sabe Jones e0effcdf5f Merge pull request #6626 from taldin/party_health 
Add HP to party page
 2016-02-04 15:56:39 -06:00
Sabe Jones b5bb73347a Merge pull request #6631 from anowlcalledjosh/icon_zoom 
Make task help icons consistent across browsers
 2016-02-04 15:51:49 -06: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 442a654e94 Removed questKey from url, added quest member support, removed extra tests, and fixed analytics import 2016-02-04 12:27:51 -06:00