Matthew K. Fu JuYuan 7e355b77c2 Merge branch 'ldap' 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/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:31:05 +08:00
..
assets	Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap	2012-04-19 14:09:37 +08:00
controllers	Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:06:00 +08:00
helpers	changes before Chirs and Ray's trip	2012-04-19 11:50:54 +08:00
models	Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:06:00 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap	2012-04-19 14:09:37 +08:00