orbit-basic/vendor/built_in_modules
Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
2012-12-25 11:01:36 +08:00
..
ad_banner fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
announcement Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00
archive Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00
calendar sidebar rewrited 2012-12-24 16:39:53 +08:00
gallery fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
location rename of GPRS 2012-12-24 16:39:53 +08:00
miss_module/config/locales Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00
page_content fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
personal_book missing file? 2012-12-24 16:39:53 +08:00
personal_diploma missing file? 2012-12-24 16:39:53 +08:00
personal_experience missing file? 2012-12-24 16:39:53 +08:00
personal_honor missing file? 2012-12-24 16:39:53 +08:00
personal_journal missing file? 2012-12-24 16:39:53 +08:00
personal_lab missing file? 2012-12-24 16:39:53 +08:00
personal_patent missing file? 2012-12-24 16:39:53 +08:00
personal_project missing file? 2012-12-24 16:39:53 +08:00
personal_research missing file? 2012-12-24 16:39:53 +08:00
personal_seminar missing file? 2012-12-24 16:39:53 +08:00
web_resource fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00