Commit Graph

10 Commits

Author SHA1 Message Date
barisusakli
8c3b52ef36 closes #4096 2016-02-17 18:24:58 +02:00
Julian Lam
7220ed2010 nodebb/nodebb-theme-persona#214 2015-12-10 11:08:30 -05:00
Julian Lam
91c012e642 #3907 2015-11-28 22:32:28 -05: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
de4d747e63 closes #3742 2015-10-13 13:58:36 -04:00
Julian Lam
167ba64018 using fancy new mixin 2015-10-07 06:05:02 -04:00
Julian Lam
f6d5b52a8b WIP user-icons 2015-09-27 12:57:21 -04:00
Henry Wright
dd61116060 Replace Less variable that is undefined if Bootstrap is absent 2015-09-08 23:44:02 +01:00
Julian Lam
f9053c077d updated groups ACP styling and template to use a table, like categories
Conflicts:
	src/views/admin/manage/groups.tpl
2015-05-27 18:42:18 -04:00
Julian Lam
9dece4a1db added some missing files from previous commits, fixed setParent mechanic which broke after I refactored, #2463 2015-03-25 17:21:38 -04:00