Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap ...

Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb

2012-04-25 16:45:04 +08:00

..

admin

Merge branch 'design_team' into ldap

2012-04-25 16:45:04 +08:00

application_controller.rb

Trying nokogiri

2012-03-27 18:42:22 +08:00

gridfs_controller.rb

The new AdBanner.

2012-04-02 03:04:38 +08:00

orbit_backend_controller.rb

Changed inherited controller in module_apps to OrbitBackendController

2012-03-27 18:58:04 +08:00

orbit_frontend_component_controller.rb

Fix extra loaded js: the widgets only need to render layout when they need js.

2012-03-07 18:16:59 +08:00

orbit_frontend_controller.rb

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

orbit_widget_controller.rb

Change Obit to Orbit

2012-03-16 11:54:31 +08:00

pages_controller.rb

Trying nokogiri

2012-03-27 18:42:22 +08:00

sessions_controller.rb

NCCU ldap debug

2012-04-23 10:13:44 +08:00