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

1402 Commits

Author SHA1 Message Date
Blade Barringer 7c8a46b178 Move message into alert box 2015-09-13 09:34:54 -05:00
Blade Barringer cd4ec5bd12 Adjust formatting in footer controller 2015-09-13 02:19:34 -05:00
Blade Barringer 14fabfbe40 Remove excess white space 2015-09-12 22:34:58 -05:00
melarish 05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Matteo Pagliazzi e86809dc07 fix leaving group 2015-09-09 22:41:41 +02:00
Sabe Jones 3931894d97 Merge pull request #5897 from HabitRPG/sabrecat/pet-201509 
September 2015 Pet Quest
 2015-09-09 11:29:51 -07:00
melarish f3ec5ccb89 Added whitespace before all items owned message 2015-09-09 17:40:59 +01:00
Matteo Pagliazzi c292d7b438 Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves 
Groups delete when last member leaves
 2015-09-09 11:26:04 +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
Sabe Jones 74cb7d7f04 chore(news): Horse Bailey 2015-09-08 14:56:49 -04:00
Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	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-08 13:25:10 -05:00
Mel Marley def3eb5c36 Now correctly displays message when user owns all Mystery items 2015-09-08 17:49:56 +01:00
Mel Marley 2bddd79ffd Some things I tried 2015-09-08 13:59:34 +01:00
Sabe Jones 54fde74c29 feat(analytics): Track another partying button 2015-09-07 22:31:41 -04:00
Sabe Jones f8ce7c2292 fix(analytics): Track modals correctly 
Fixes #5879.
 2015-09-07 22:23:42 -04:00
Sabe Jones f044f83772 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-09-07 21:55:28 -04:00
Blade Barringer bb06e95c4e Add emoji class to list of classes that should not use pixelated rendering 2015-09-07 15:29:24 -05:00
Sabe Jones d6f416b6d3 feat(analytics): Track party buttons 2015-09-07 12:02:01 -04:00
Blade Barringer c9af8e60b8 Adjust formatting 2015-09-06 20:29:09 -05:00
Blade Barringer 82b7bb3a1b Add markdown to faq 2015-09-06 19:46:29 -05:00
Blade Barringer 205bbeee75 Add marked to jade rendering 2015-09-06 19:45:35 -05:00
Blade Barringer 0b99f77a1c Simplify web faq 2015-09-06 18:30:01 -05:00
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
TheHollidayInn 82a3ca8a4d Merged changes to firebase branch 2015-09-06 16:58:44 -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
TheHollidayInn b839c0cd0c Change condition scope to fix updating for public guilds with a member count of 1 2015-09-06 15:31:41 -05:00
TheHollidayInn 700a6ddd9e Remove users inviations when guild is deleted 2015-09-06 15:31:40 -05:00
TheHollidayInn e68e29db8f Delete private guilds or parties when last member leaves. 2015-09-06 15:31:40 -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
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05: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
Blade Barringer 346440d32c Disable cds button if cds == user's preference 2015-09-06 10:14:44 -05:00
Blade Barringer ee50fec2c1 Tweak wording of custom day start warning 2015-09-06 10:11:28 -05:00
Blade Barringer 074e683ba7 Change formatting of cds modal 2015-09-06 09:57:44 -05:00
Blade Barringer a44cd748af Use the user's preferred date format 2015-09-06 09:42:48 -05:00
Blade Barringer f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05: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
Blade Barringer 085a785e4d Convert input to select box 2015-09-06 09:22:40 -05: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
Blade Barringer 3a8eda6c1a Remove extraneous info about last cron 2015-09-05 15:35:07 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer d45602c340 Adjust spacing 2015-09-05 09:45:08 -05:00
Blade Barringer 310bb3dfd9 Format settings page 2015-09-05 09:39:30 -05:00