Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap ...

Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json

2012-05-14 00:57:17 +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 'design_team' into ldap

2012-05-09 15:25:16 +08:00

_side_bar.html.erb

New Interface for App Auth and Object Auth

2012-05-14 00:50:12 +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