Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap ...

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

2012-03-19 14:27:15 +08:00

..

admin

Merge branch 'master' into ldap

2012-03-19 14:27:15 +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

code for new fact check

2012-03-16 11:09:44 +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

Fix announcement pagination in front-end

2012-03-07 18:16:59 +08:00

sessions_controller.rb

LDAP with sync rake task

2012-03-06 16:41:06 +08:00