orbit-4-1

Archived

0 Fork 0

This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Files

T

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

ad_banners

Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner

2012-04-13 16:52:14 +08:00

ad_images

fix new ad_image data selector bug

2012-04-13 15:24:59 +08:00

app_auths

Listing for Module-apps

2012-01-12 14:13:41 +08:00

assets

brief starting for dashboard,adds i18n vars