saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/config
History
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
..
environments Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00
initializers Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00
locales LDAP with sync rake task 2012-03-06 16:41:06 +08:00
application.rb Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00
boot.rb rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
config.yml Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +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 for different database for demo 2012-02-29 13:15:25 +08:00
routes.rb Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00