Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine ... Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb		2012-02-29 13:07:21 +08:00
..
admin	Add categories for all the widgets	2012-02-28 22:00:05 +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
obit_frontend_component_controller.rb	Changes for jquery 1.7 (.live -> .on), create module_layout	2012-02-20 03:24:05 +08:00
obit_frontend_controller.rb	Change NewBlog to new_blog	2012-01-10 18:29:11 +08:00
obit_widget_controller.rb	Change NewBlog to new_blog	2012-01-10 18:29:11 +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