chris d2602a3a84 Change code for new page slide.js ... Conflicts: app/views/admin/pages/_form.html.erb		2013-10-19 19:14:14 +08:00
..
_category.html.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00
_edit.html.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00
_form.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
_index.html.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00
_new.html.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00
edit.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
edit.js.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00
index.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
index.js.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
new.html.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
new.js.erb	Change code for new page slide.js	2013-10-19 19:14:14 +08:00