krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

2671 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
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
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
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
Matteo Pagliazzi
fa14464a0c add accept quest route 2016-02-10 17:07:34 +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
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
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
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
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
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
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
Keith Holliday
0684e30790 Added quest cancel route and initial tests 2016-02-03 17:04:57 -06:00
Matteo Pagliazzi
19a709c360 remove console.log statements 2016-02-03 11:30:09 +01:00
Matteo Pagliazzi
1daf87531a add population to join and update routes of challenges and groups, remove chat flags info everywhere 2016-02-03 11:29:19 +01:00
Keith Holliday
d5148a7bf0 Added quest reject route and intial tests 2016-02-02 16:38:31 -06:00
Matteo Pagliazzi
a8dc529449 adapt create challenge tests to population 2016-02-02 22:09:35 +01:00
Sabe Jones
d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Matteo Pagliazzi
7a5aa731db add population to challenge.group, challenge.leader and group.leader 2016-02-02 21:47:12 +01:00
Tyler Smith
065238525c Removing extra class in favor of .lead 2016-02-02 10:22:17 -08:00
Matteo Pagliazzi
509dffd0c7 update hasAccess to include public guilds 2016-02-02 19:13:29 +01:00
Matteo Pagliazzi
2ad5dbcc74 Merge pull request #6590 from TheHollidayInn/api-v3-get-group-challenges 
Added get group challenges route and initial tests
 2016-02-02 19:06:37 +01:00
Taldin
51e579cb6a Update for cleaner code. 
Per Alys and crookedneighbor's suggestion.
 2016-02-02 10:01:08 -08:00
Keith Holliday
754befc580 Updated test syntax and added get user challenges tests 2016-02-02 10:29:55 -06:00
Matteo Pagliazzi
337b68ce43 make sure that tasks are returned in the correct order 2016-02-02 12:23:56 +01:00
Matteo Pagliazzi
4aa6545c79 fix access control when getting tasks for a challenge 2016-02-02 11:56:06 +01:00
Matteo Pagliazzi
9854d1cf34 add missing test file and update parameters for GET tasks 2016-02-02 11:42:05 +01:00
Matteo Pagliazzi
824603bc89 fix moveTask and add tests 2016-02-02 11:14:55 +01:00
Blade Barringer
e3c7d2834e refactor(api-v3): Move quest routes to separate file 2016-02-01 21:14:20 -06:00