This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

Christophe Vilayphiou 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/pages/_edit.html.erb app/views/admin/pages/_form.html.erb lib/parsers/parser_back_end.rb		2012-05-13 23:14:13 +08:00
..
_app_selector.html.erb	Fix parser_back_end & side_bar & meta	2012-03-30 15:51:29 +08:00
_edit.html.erb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-13 23:14:13 +08:00
_form.html.erb	Changes in page_edit	2012-05-13 20:13:26 +08:00
_new.html.erb	Changes in page_edit	2012-05-13 20:13:26 +08:00
_show.html.erb	Changes for js and ccs load for site's pages	2012-04-26 01:49:02 +08:00
_themes_ddl.html.erb	structure.css -> default.css	2011-09-05 15:18:36 +08:00
create.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00
delete.html.erb	Delete page.	2011-06-01 12:00:41 +08:00
delete.js.erb	Prefix ids with "back_" in back-end layout to avoid conflict with site's ids	2011-12-29 15:35:13 +08:00
edit.html.erb	Merge with branch november_presentation	2011-12-01 13:50:49 +08:00
edit.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00
new.html.erb	Items UI changes	2011-06-10 13:57:42 +08:00
new.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00
reload_themes.js.erb	structure.css -> default.css	2011-09-05 15:18:36 +08:00
show.html.erb	Fix for structure js and css	2012-04-25 18:41:38 +08:00
show.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00
update.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00