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

100 Commits

Author SHA1 Message Date
Kevin Gisi 4525ee5358 Revert "Revert "Removed user's party invites when last user leaves party"" 2015-09-17 23:27:21 -04:00
Kevin Gisi c26cd1fe5b Revert "Removed user's party invites when last user leaves party" 2015-09-17 04:00:07 -04:00
Blade Barringer c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves 
Removed user's party invites when last user leaves party
 2015-09-16 07:59:32 -05:00
Alys fbaa5d4321 add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme 2015-09-12 11:05:31 +10:00
TheHollidayInn 26e6126a25 Removed redundant code when removing group invitations 2015-09-11 12:14:01 -05:00
TheHollidayInn 5c8c5a9ed3 Removed user's party invites when last user leaves party 2015-09-10 23:29:32 -05:00
Matteo Pagliazzi e86809dc07 fix leaving group 2015-09-09 22:41:41 +02:00
TheHollidayInn ca37f4161c Removed firebase deleteGroup to post remove 2015-09-08 21:17:28 -05:00
TheHollidayInn cf2548693f Changed cb2 to cb and removed extra query when removing group 2015-09-08 20:12:58 -05:00
TheHollidayInn c7d09acd74 Moved inivtation removal functions to group pre remove middleware 2015-09-08 15:58:53 -05:00
TheHollidayInn 82a3ca8a4d Merged changes to firebase branch 2015-09-06 16:58:44 -05:00
Matteo Pagliazzi bfd6d055b0 merge into develop 2015-09-06 21:21:39 +02:00
Matteo Pagliazzi ef9aecf531 disable firebase syncing for tavern 2015-09-06 20:08:31 +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 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 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 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
Sabe Jones 12b0361d45 WIP(warning-modal): Low health warning 2015-08-18 16:05:48 -04:00
Matteo Pagliazzi b31966b1ee use assign in place of merge, make sure references to tavern and mods are not lost 2015-08-14 22:02:19 +02:00
Matteo Pagliazzi 34dd4494ec in locals middleware require tavern and mods only once 2015-08-14 13:10:53 +02:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Sabe Jones ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones 13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Blade Barringer f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Blade Barringer 65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer 3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Alys cb9f5bcff3 Merge pull request #5523 from hairlessbear/update_isOnQuest_logic 
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
 2015-07-14 08:11:35 +10:00
Will 9bcb3b5cbe update model maxHealth 2015-07-03 22:22:28 -07:00
Sabe Jones d4b5620ada Merge branch 'sabrecat/summer-splash' into develop 2015-07-01 13:13:23 -05:00
Sabe Jones 25dd82ffa0 feat(event): Summer Splash cont'd 
Summer backgrounds, the Seafoam transformation item, and announcements for same.
 2015-07-01 13:11:53 -05:00
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
hairlessbear 0094d3267d Fixed equivalency check (added missing '=') 2015-06-29 18:28:08 -04:00
hairlessbear bcfc17dd18 Added check for user id in active quest to 'isOnQuest' 2015-06-29 15:42:45 -04:00
hairlessbear 0b1cc5f0ea Removed user.party.quest.key checks from isOnQuest. They are no longer accurate checks due to changes made in #5298 2015-06-29 13:12:29 -04:00
Alys 03d1f12a7c fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518 2015-06-29 19:42:22 +10:00
Blade Barringer b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Alys 0fc14f129d prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466 2015-06-27 14:19:40 +10:00
Blade Barringer 19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -05:00
hairlessbear 02acad9dfc Removed unused 'armorSet' attribute in user model 2015-06-20 01:38:47 -04:00
Alys 07b41d16b6 Revert "Revert "new GSalvadi audio theme, created by NomindTR"" 
This reverts commit 30a091e14e.
 2015-06-18 22:19:35 +10:00
Alys 30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
Alys 910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Matteo Pagliazzi b12ee725f4 incrementally enable weekly recap emails 2015-06-16 20:26:58 +02:00
Matteo Pagliazzi 95b481b31d use discriminator field to distinguish users with weekly recap emails enabled 2015-06-16 17:51:24 +02:00
Matteo Pagliazzi a82270fbaa feat(weekly-recap): enable for new users who sign in 2015-06-16 11:15:03 +02:00