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

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

2012-05-22 20:33:07 +08:00

..

admin

Merge branch 'design_team' into ldap

2012-05-22 20:33:07 +08:00

application_controller.rb

Changes for structure

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

gridfs_controller.rb

The new AdBanner.

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

orbit_backend_controller.rb

Fixed bugs for nccu

2012-05-22 20:00:07 +08:00

orbit_frontend_component_controller.rb

Changes for widgets

2012-05-13 21:55:39 +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

Add impressionist

2012-05-15 21:26:09 +08:00

sessions_controller.rb

Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.

2012-05-15 11:28:24 +08:00