Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ... Conflicts: config/environments/development.rb		2012-03-01 10:13:49 +08:00
..
admin	change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.	2012-02-29 18:58:33 +08:00
application_controller.rb	Changes for orbit bar, login	2012-02-19 16:33:22 +08:00
gridfs_controller.rb	Modifications for image urls	2011-09-01 19:08:45 +08:00
orbit_backend_controller.rb	fix bugs with token	2012-02-29 18:56:42 +08:00
orbit_frontend_component_controller.rb	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +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	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
pages_controller.rb	Change orbit-bar for language but bug when user name is too long	2012-02-29 04:21:56 +08:00
sessions_controller.rb	ldap config for 0229 nccu demo	2012-02-29 12:35:54 +08:00