Commit Graph

18 Commits

Author SHA1 Message Date
Nicolas Siver
1bfb41bccb sorting tree 2015-05-31 10:49:03 +03:00
Nicolas Siver
46ce3aae9f tree view 2015-05-30 18:44:31 +03:00
Julian Lam
202789fa8d added back category creation, #2463 2015-03-25 18:08:15 -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
e8167a80a0 if bgColor and color are not sent in the category creation call, automatic colours are supplied 2015-03-10 14:55:25 -04:00
barisusakli
dc94fe2b6c move admin upload routes to api namespace
move usrrs/csv to api namespace
2015-03-07 20:19:00 -05:00
psychobunny
c1b45bc0ea #2779 when duplicating categories, rename category:name to indicate it is duplicate
otherwise :rage1: when somebody deletes the wrong category
2015-02-25 18:54:11 -05:00
psychobunny
5020e864fc #2779 also copy icon 2015-02-25 18:52:26 -05:00
psychobunny
59d176fa7b closes #2779 2015-02-25 18:29:23 -05:00
Julian Lam
69ed8ac45d icon selection interface -- moved iconSelect module out of admin space, #2588 2015-01-11 17:24:15 -05:00
Julian Lam
dfe8e8de70 image uploading for categories, #2463 2015-01-01 15:35:22 -05:00
Julian Lam
84e90cd73d category enable/disabled #2463 2014-12-30 12:25:39 -05:00
Julian Lam
6b95b28db7 drag/drop re-ordering fixed in ACP, #2463 2014-12-29 21:21:17 -05:00
Julian Lam
c98331de82 revamping categories management page in ACP, #2463 2014-12-29 21:21:17 -05:00
barisusakli
5bf46864ed removed global admin object, CF rocket loader fix
added colorpicker module
2014-12-13 22:14:08 -05:00
psychobunny
cad3f3017c moved iconSelect to admin/modules 2014-10-10 03:12:04 -04:00
psychobunny
ed60deb3f5 fixed ACP from previous commit 2014-10-08 16:08:35 -04:00
psychobunny
b51c90dcb3 doing some reshuffling in public/src
public/src/admin and public/src/client; also some cleanup in
src/meta/js, no need to filter out admin files anymore
2014-10-08 15:36:47 -04:00