You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		10 years ago
..
advanced	try #2 (I give up, grunt-watch seems so unpredictable... on windows anyways)	10 years ago
appearance	ACP Text Colour	10 years ago
bootstrap	updating bootstrap in ACP to v3.3.1	10 years ago
extend	tweaks to ACP plugins page	10 years ago
general	drag & drop routes	10 years ago
manage	revamping categories management page in ACP, #2463	10 years ago
modules	refactored selectable to use 'selected' instead of 'dropped'; fixed position relative bug	10 years ago
admin.less	Merge branch 'master' into categories_revamp	10 years ago
mixins.less	did some much needed spring cleaning of the admin less files	10 years ago