developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
orbit-4-1/app/views/admin/sites
History
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
..
_registration.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
_side_bar.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
_sitemap_block.html.erb Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
_update.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
index.html.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
language.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
mail_setting.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
new.html.erb Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
site_info.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
sitemap.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
sitemap_frontend.html.erb Change width for site map frontend, add link for more in announcement widget 2012-08-08 10:53:04 +08:00
system_info.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
ui_theme.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00