56 Commits (094bab24c983b84239074d6548ea604f4fc69a33)

Author SHA1 Message Date
barisusakli f4bfcc7351 removed icon:bgColor and icon:text from db calls
calculates from username on the fly
9 years ago
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
9 years ago
barisusakli 751a6c6839 got rid of extra call to user.getSettings 9 years ago
barisusakli f2d6f931af closes #3505 9 years ago
barisusakli 94129287d0 moved non-async code 9 years ago
barisusakli da4034a10a middleware refactor 9 years ago