This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap ... Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb		2012-04-30 07:57:20 +08:00
..
admin	Merge branch 'design_team' into ldap	2012-04-30 07:57:20 +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	DRY code for sorting	2012-04-30 06:30:52 +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	Separate announcement and news	2012-04-30 06:31:46 +08:00
sessions_controller.rb	NCCU ldap debug	2012-04-23 10:13:44 +08:00