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

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +08:00

..

admin

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00

application_controller.rb

Test version for DB sync schedule job

2012-05-08 19:20:53 +08:00

gridfs_controller.rb

The new AdBanner.

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

orbit_backend_controller.rb

Put sorting in web_link, page_context and design

2012-05-05 21:20:20 +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

Add position ordering and hiding page for i18n

2012-05-06 00:35:13 +08:00

sessions_controller.rb

NCCU ldap debug

2012-04-23 10:13:44 +08:00