Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap ... Conflicts: Gemfile Gemfile.lock config/application.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb		2012-03-19 14:27:15 +08:00
..
_drop_down_menu.html.erb	brief starting for dashboard,adds i18n vars	2012-02-15 00:34:21 +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	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
_side_bar.html.erb	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-03-16 14:55:21 +08:00
admin.html.erb	Ray's modification before redesign	2012-01-24 11:57:27 +08:00
application.html.erb	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
devise.html.erb	Changes for orbit bar, login	2012-02-19 16:33:22 +08:00
module_widget.html.erb	Ika's changes	2012-02-23 15:53:15 +08:00
new_admin.html.erb	Orbit-bar in front-end and back-end, side-bar and drop-down menu	2012-02-15 00:34:22 +08:00
panel.html.erb	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
site_editor.html.erb	Ray's modification before redesign	2012-01-24 11:57:27 +08:00