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

12052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 2c2ab97666 Move larger sprites to separate folder 2015-09-12 11:09:08 -05:00
Blade Barringer 1a28c37167 Reorganize sprite task 2015-09-12 10:51:15 -05:00
Blade Barringer 43576addf8 Refactor sprite indicies function 2015-09-12 10:24:06 -05:00
Blade Barringer 384ee42bca Remove unused sprites 2015-09-12 08:35:18 -05:00
Blade Barringer 5cea988891 Calculate number of sprite tasks by img dimensions 2015-09-12 08:27:05 -05:00
Alys fbfd2ef0ea add a missing closing bracket to the end of webFaqAnswer6 2015-09-12 23:22:47 +10:00
Blade Barringer 17efad6a30 Rework compiled dimensions task to not rely on lodash 2015-09-11 20:53:32 -05:00
Alys 365a58641d Merge pull request #5917 from Alys/audio-LuneFox-2015-09-09 
new audio theme from LuneFox
 2015-09-12 11:24:12 +10: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
Blade Barringer d3d365a74a Move sprites task to gulp 2015-09-11 19:59:06 -05:00
TheHollidayInn aab7d5c257 Added test to check that group invites are removed when user cancels account 2015-09-11 12:56:19 -05: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
Sabe Jones 6396b064d2 fix(social): Localize Tweet button 2015-09-10 18:51:19 -04:00
Sabe Jones 45c8bb06e2 Revert "feat(modals): Simplified scroll drop" 
This reverts commit 8b4d34da00.
 2015-09-10 18:08:51 -04:00
Sabe Jones c03107b54b feat(social): Twitter share main page 2015-09-10 17:54:40 -04:00
Sabe Jones 9d5f9328da WIP(social): Twitter widget script 2015-09-10 17:44:52 -04:00
Sabe Jones e4c7870c22 WIP(social): Non-AddThis Tweet button 2015-09-10 17:31:12 -04:00
Sabe Jones 7a10715eee WIP(social): Tweaked Twitter desc 2015-09-10 17:12:00 -04:00
Sabe Jones 4492007f49 feat(social): Twitter meta on front 2015-09-10 16:36:23 -04: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
Matteo Pagliazzi 0330735e8e fix migrations 2015-09-09 22:32:12 +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
Sabe Jones 8b4d34da00 feat(modals): Simplified scroll drop 2015-09-09 14:27:34 -04:00
melarish f3ec5ccb89 Added whitespace before all items owned message 2015-09-09 17:40:59 +01:00
Blade Barringer bd1ae09749 Simplify scripts (node scripts use ./node_modules version of things by default) 2015-09-09 09:04:10 -05:00
Blade Barringer addf19afc1 Add nvmrc file 2015-09-09 06:57:57 -05:00
Blade Barringer ddfb5c92ab Merge pull request #5899 from crookedneighbor/gulp-ify-start 
Gulp-ify the start process
 2015-09-09 06:46:06 -05:00
Matteo Pagliazzi d64ce2fcdf fix groups migration 2015-09-09 11:43:00 +02: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
Blade Barringer 1406166823 remove unneeded require 2015-09-08 16:21:02 -05:00
TheHollidayInn c7d09acd74 Moved inivtation removal functions to group pre remove middleware 2015-09-08 15:58:53 -05:00
Blade Barringer a85116540c Move run:dev task to gulp 2015-09-08 15:45:09 -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 9421c63ac9 fix(FAQ): Remove sample task anchors 2015-09-07 21:58:56 -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
Blade Barringer 325fa976f6 chore(i18n): update locales 2015-09-07 15:27:52 -05:00
Sabe Jones d6f416b6d3 feat(analytics): Track party buttons 2015-09-07 12:02:01 -04:00
Blade Barringer 168ba0c96c Merge pull request #5887 from HabitRPG/sabrecat/faq 
Static FAQ page
 2015-09-06 20:34:49 -05:00
Blade Barringer 31aace95ef Merge pull request #5894 from crookedneighbor/merge-faqs 
Merge faqs
 2015-09-06 20:32:05 -05:00
Blade Barringer c9af8e60b8 Adjust formatting 2015-09-06 20:29:09 -05:00