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

345 Commits

Author SHA1 Message Date
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer d02f2d34e3 Merge pull request #5893 from crookedneighbor/content-faq 
Content FAQ for iOS
 2015-09-06 16:38:18 -05:00
Blade Barringer b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Matteo Pagliazzi bfd6d055b0 merge into develop 2015-09-06 21:21:39 +02:00
Matteo Pagliazzi 4600e96dc0 firebase can be enabled through config 2015-09-06 20:19:53 +02:00
Matteo Pagliazzi 607ddbb1f2 typos and disable firebase 2015-09-06 20:11:24 +02:00
Matteo Pagliazzi ef9aecf531 disable firebase syncing for tavern 2015-09-06 20:08:31 +02:00
Matteo Pagliazzi b395596614 firebase should only run in production 2015-09-06 16:35:49 +02:00
Matteo Pagliazzi 995e3a796d store group name on firebase 2015-09-06 16:29:45 +02:00
Matteo Pagliazzi 4c89538d18 typos and comments 2015-09-06 16:22:12 +02:00
Matteo Pagliazzi 521c999963 delete groups and users from firebase when deleted on habitica 2015-09-06 16:09:13 +02:00
Matteo Pagliazzi 9764e31e2a firebase: remove instead of set(false) 2015-09-05 16:33:41 +02:00
Matteo Pagliazzi db0a73d332 add router to get firebase token for user 2015-09-05 16:21:46 +02:00
Matteo Pagliazzi c89cf20bd3 sync groups' members with firebase 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi ec45a87dce fix tests 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi 0f1d514460 typo 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi 37ae48891c wip: firebase 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi f5f19d146e start adding firebase 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi 6d91a1905a remove unnecessary code 2015-09-05 15:44:45 +02:00
Matteo Pagliazzi d9383e0f97 add Group.methods.leave, user is removed from groups when his account is deleted 2015-09-05 15:44:44 +02:00
Matteo Pagliazzi e5f4898222 when last user is removed from private group, delete the group 2015-09-05 15:44:44 +02:00
Matteo Pagliazzi ee9b3d7857 remove unnecessary code 2015-09-05 15:44:44 +02:00
Matteo Pagliazzi d5fb2afaa4 add Group.methods.leave, user is removed from groups when his account is deleted 2015-09-05 15:44:44 +02:00
Matteo Pagliazzi 0cd35a374a when last user is removed from private group, delete the group 2015-09-05 15:44:44 +02:00
Blade Barringer 807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Blade Barringer 1d032a43a6 Format if else 2015-09-04 18:39:45 -05:00
Sabe Jones 869651f5a2 feat(FAQ): Static FAQ page 
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
 2015-09-04 15:05:15 -04:00
Blade Barringer 0d78c01de3 Merge pull request #5877 from TheHollidayInn/guilds-user-becomes-lead-when-joins-empty-group 
Groups now make joining user the leader when they are empty
 2015-09-04 09:43:26 -05:00
Sabe Jones e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
TheHollidayInn 0adfcc3415 Groups now make joining user the leader when they are empty 2015-09-02 12:36:13 -05:00
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-01 13:40:20 -05:00
Matteo Pagliazzi 7acec14e6b do not allow leaders to kick themselves from group 2015-09-01 16:33:24 +02:00
Kevin Gisi 69782b5bd1 Fixed the wrong redirect 2015-08-31 17:59:19 -04:00
Kevin Gisi 177c48820c Domain redirects -> 301 2015-08-31 17:34:18 -04:00
Blade Barringer fcf187fb47 Remove logic for removing quest info 2015-08-28 22:55:02 -05:00
Blade Barringer 342343d34f Prevent user from leaving party during active quest 2015-08-28 22:41:30 -05:00
Blade Barringer ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Blade Barringer f584b173c8 Add user scrub quest data back in 2015-08-24 12:58:31 -05:00
Blade Barringer 66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 0b7e43f156 Add route for leaving active quest 2015-08-23 20:29:57 -05:00
Blade Barringer fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Alys fd446fc5e5 convert habitica.com to BASE_URL 2015-08-23 12:23:35 +10:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer 8fc69102aa Merge branch 'develop' into 3onyc-fix-hash-leak 2015-08-22 17:45:47 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Blade Barringer 7fcfe6734b Correct spacing 2015-08-21 08:19:06 -05:00
Sabe Jones 12b0361d45 WIP(warning-modal): Low health warning 2015-08-18 16:05:48 -04:00
3onyc 1c13c48bee Fix removing user salt+hash from API response 2015-08-16 17:04:24 +02:00