4 Commits

Author	SHA1	Message	Date
Julian Lam	d95f5a9ae0	added help block to category purge button, updated iconSelect library to use templates in a better way, hooked up iconSelect for category mgmt, #2463	2015-03-25 19:29:24 -04:00
Julian Lam	a1621145d5	Merge branch 'master' into categories_revamp ... Conflicts: public/less/admin/admin.less public/src/admin/manage/categories.js src/controllers/admin.js src/views/admin/manage/categories.tpl src/views/config.json	2015-03-25 11:16:37 -04:00
Julian Lam	56200b0fdf	defining module name in iconSelect module	2015-01-20 20:55:22 -05:00
Julian Lam	69ed8ac45d	icon selection interface -- moved iconSelect module out of admin space, #2588	2015-01-11 17:24:15 -05:00