Commit Graph

8 Commits

Author SHA1 Message Date
barisusakli
d7df6c0b06 remove more from config 2016-02-10 12:53:39 +02:00
psychobunny
f94cd21f83 #3875 filter:scripts.get now acts like filter:admin.scripts.get; does not get minified 2016-01-18 15:32:49 -05:00
barisusakli
f4bfcc7351 removed icon:bgColor and icon:text from db calls
calculates from username on the fly
2015-10-29 16:35:53 -04:00
Julian Lam
b52475c270 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
2015-10-25 07:33:59 -04:00
barisusakli
751a6c6839 got rid of extra call to user.getSettings 2015-10-23 14:07:09 -04:00
barisusakli
f2d6f931af closes #3505 2015-10-16 18:43:40 -04:00
barisusakli
94129287d0 moved non-async code 2015-10-11 23:20:57 -04:00
barisusakli
da4034a10a middleware refactor 2015-10-11 23:05:33 -04:00