saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/admin/assets
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
..
_asset.html.erb fix commit bugs 2012-09-13 15:53:36 +08:00
_edit.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
_filter.html.erb Change assets 2012-05-16 11:07:11 +08:00
_form.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
_new.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
_sort_headers.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
create.html.erb tiny mce fix 2012-09-19 17:59:17 +08:00
create1.js.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
edit.html.erb Add missing translations 2012-09-24 09:02:46 +08:00
file_upload.html.erb fix i18n.file upload failed 2012-09-27 13:34:40 +08:00
index.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
index.js.erb Asset upload 2012-05-17 06:28:29 +08:00
new.html.erb Add missing translations 2012-09-24 09:02:46 +08:00