Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +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

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00

_side_bar.html.erb

Clean up code , cache other auths. Fix sidebar

2012-05-29 17:17:26 +08:00

_users_checkbox_ary.html.erb

Clean up code , cache other auths. Fix sidebar

2012-05-29 17:17:26 +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

desktop.html.erb

Desktop Commit

2012-04-06 17:47:02 +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 inc/ajax_setting in new_admin

2012-05-22 16:11:00 +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

Changes for structure

2012-05-22 14:45:49 +08:00