Christophe Vilayphiou ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb		2012-05-16 01:31:16 +08:00
..
_drop_down_menu.html.erb	Delete useless code in items	2012-04-12 18:13:10 +08:00
_lang_menu.html.erb	Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)	2011-04-13 18:19:51 +08:00
_orbit_bar.html.erb	Ray's changes for inccu in orbit_bar	2012-05-09 15:20:09 +08:00
_side_bar.html.erb	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-05-16 01:31:16 +08:00
admin.html.erb	changes before Chirs and Ray's trip	2012-04-19 11:50:54 +08:00
application.html.erb	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
devise.html.erb	Changes for IE9 with html5	2012-03-21 15:51:55 +08:00
module_widget.html.erb	Changes for widgets	2012-05-13 21:55:39 +08:00
new_admin.html.erb	Put site_settings in the orbit_button	2012-05-08 20:06:56 +08:00
page_layout.html.erb	Add nccu icon	2012-05-08 15:27:43 +08:00
panel.html.erb	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
site_editor.html.erb	Add drag and drop to structure side_bar	2012-05-11 10:00:45 +08:00