orbit-basic/app/controllers
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
..
admin Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
application_controller.rb Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
gridfs_controller.rb The new AdBanner. 2012-04-02 03:04:38 +08:00
orbit_backend_controller.rb Fix new page form 2012-05-13 23:48:34 +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 custom title to widgets 2012-05-13 22:35:00 +08:00
sessions_controller.rb NCCU ldap debug 2012-04-23 10:13:44 +08:00