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.
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 |
| .. |
|
development.rb
|
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
|
2012-04-19 14:06:00 +08:00 |
|
production.rb
|
Replace PrototypeR4 by Orbit.
|
2012-03-16 14:58:32 +08:00 |
|
test.rb
|
Replace PrototypeR4 by Orbit.
|
2012-03-16 14:58:32 +08:00 |