Commit Graph

11063 Commits

Author SHA1 Message Date
Blade Barringer
7aad958062 Merge pull request #5922 from crookedneighbor/gulpify
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
Blade Barringer
14fabfbe40 Remove excess white space 2015-09-12 22:34:58 -05:00
Blade Barringer
dab6b555c4 Revert files 2015-09-12 22:32:13 -05:00
Blade Barringer
41458fbd5b chore(i18n): update locales 2015-09-12 22:26:30 -05:00
Blade Barringer
be6acd7c09 Move post to slack function to task helper 2015-09-12 22:23:08 -05:00
Blade Barringer
b65c8e3b16 Change directory name from guides to scenes 2015-09-12 21:23:41 -05:00
Blade Barringer
5876c37271 Remove underscores from function names 2015-09-12 21:04:38 -05:00
Blade Barringer
a0e5ea6f4f Reformat sprite tasks 2015-09-12 20:43:04 -05:00
Blade Barringer
1df4cf81dd compile sprites using gulp 2015-09-12 11:22:15 -05:00
Blade Barringer
c2eb916be1 Add cssmin task to build:dev 2015-09-12 11:19:56 -05:00
Blade Barringer
d79427e879 Functionify sprite task creation 2015-09-12 11:09:29 -05:00
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