Commit Graph

9 Commits (a6d270082337b64e95a0fa119bf28d6f3ba1972c)

Author SHA1 Message Date
Julian Lam 7220ed2010
Julian Lam 91c012e642
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
barisusakli de4d747e63 closes
Julian Lam 167ba64018 using fancy new mixin
Julian Lam f6d5b52a8b WIP user-icons
Henry Wright dd61116060 Replace Less variable that is undefined if Bootstrap is absent
Julian Lam f9053c077d updated groups ACP styling and template to use a table, like categories
Conflicts:
	src/views/admin/manage/groups.tpl
Julian Lam 9dece4a1db added some missing files from previous commits, fixed setParent mechanic which broke after I refactored,