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
12,183 Commits 64 Branches 1,226 Tags
792e8d80943ed407be1fef4ed9b27568f71f28a6
Commit Graph

84 Commits

Author SHA1 Message Date
Kaitlin Hipkin
792e8d8094 fix awarding of party {up,on} achievs to update server 2016-03-10 20:38:53 -05:00
Kaitlin Hipkin
d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Georgi Gardev
beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Matteo Pagliazzi
c5b7873406 add support for habitica-android in x-client header 2015-12-09 11:02:26 +01:00
Sabe Jones
a42c671f1f fix(model): Remove common.inviteParty 
Per @vIiRuS
 2015-11-30 15:48:46 -05:00
Phillip Thelen
743e7cbebd store inviteParty coachmark for iOS app 2015-11-23 16:24:46 +01:00
Sabe Jones
e73c7be47a fix(achievement): Make Costume Contest repeatable 2015-11-16 16:07:16 -05:00
Blade Barringer
ada97c1f91 Add invite party to ios tutorial 2015-11-13 07:19:51 -06:00
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Blade Barringer
4cbda6818c Correct code to not iterate over mongoose object 2015-11-05 13:08:37 -06:00
Blade Barringer
905e7b17ea Refactor user model 2015-11-04 18:00:40 -06:00
Phillip Thelen
7f189bebba disable tutorial/tour depending on client 2015-11-04 16:54:47 +01:00
Phillip Thelen
921ee881a5 Only create sample habits+dailies when registered through website 2015-11-04 16:41:13 +01:00
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Blade Barringer
dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP 
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
 2015-10-28 16:36:47 -04:00
kylestratis
0283408d1e Removed FIXME comment above invitations object - the object is still being used. 2015-10-27 21:12:19 -04:00
Matteo Pagliazzi
c7f8426bce preparation for code for lowercase emails and lowercase version of username to check for duplicates 2015-10-21 11:01:06 +02:00
Phillip Thelen
2fde3c771f remove empty line 2015-10-19 12:50:30 +02:00
Ricardo Mendes
e79863e134 Adds auto-equip boolean to user preferences 2015-10-19 05:20:10 +00:00
Phillip Thelen
7a7d038602 Split up tutorial parts 2015-10-18 17:29:06 +02:00
Phillip Thelen
caa7d4a220 store iOS tutorial steps 2015-10-12 16:34:07 +02:00
Sabe Jones
e96410aa57 feat(pets): Spooky pets/mounts 2015-09-22 14:23:52 -04: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
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
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
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
Alys
14983cb996 replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet 2015-06-16 13:10:49 +10:00