Orbit/app/views/admin
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
..
ad_banners Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
ad_images Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
app_auths Fix typos after i18n yml 2012-09-24 09:02:45 +08:00
asset_categories Changes for i18n yml 2012-09-24 09:02:45 +08:00
assets Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
attributes Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
components Changes for i18n yml 2012-09-24 09:02:45 +08:00
dashboards Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
designs Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
infos Add missing translations 2012-09-24 09:02:46 +08:00
items Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
links Changes for i18n yml 2012-09-24 09:02:45 +08:00
module_apps Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
module_apps_new_interface Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
object_auths Changes for i18n yml 2012-09-24 09:02:45 +08:00
object_auths_new_interface object_auth change to reload 2012-10-04 18:20:21 +08:00
page_parts Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
pages Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
plugins Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
purchases Fix typos after i18n yml 2012-09-24 09:02:45 +08:00
roles Add missing translations 2012-09-24 09:02:46 +08:00
sites Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
tags Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
users Add missing translations 2012-09-24 09:02:46 +08:00
users_new_interface Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00