nodebb

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