developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
orbit-4-1/config
History
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit 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
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.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-04-19 14:06:00 +08:00
..
environments Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
initializers Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
locales Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
application.rb Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +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' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00