Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap ... Conflicts: Gemfile Gemfile.lock app/views/admin/attributes/_app_selector.html.erb app/views/admin/module_apps/_app_selector.html.erb app/views/admin/pages/_app_selector.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-04-12 18:50:48 +08:00
..
environments	close alpha on nccu	2012-03-20 14:38:01 +08:00
initializers	close alpha on nccu	2012-03-20 14:38:01 +08:00
locales	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
application.rb	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
boot.rb	rails 3.1 and designs (with bug)	2011-07-12 16:00:57 +08:00
config.yml	close alpha on nccu	2012-03-20 14:38:01 +08:00
database.yml.example	Add admin/pages scaffold and basic page render	2009-05-08 01:18:16 +08:00
environment.rb	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
list.yml	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
mongoid.yml	close alpha on nccu	2012-03-20 14:38:01 +08:00
routes.rb	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00