saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/layouts
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
..
_drop_down_menu.html.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
_lang_menu.html.erb Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
_orbit_bar.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
_side_bar.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
_side_bar_content.html.erb Changes for side_bar 2012-10-26 11:19:56 +08:00
_users_checkbox_ary.html.erb fix for not working cache 2012-07-13 18:32:17 +08:00
admin.html.erb new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
application.html.erb Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
desktop.html.erb Desktop Commit 2012-04-06 17:47:02 +08:00
devise.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
module_widget.html.erb Changes for widgets 2012-05-13 21:55:39 +08:00
new_admin.html.erb Changes for side_bar 2012-10-26 11:19:56 +08:00
page_layout.html.erb Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
site_editor.html.erb Changes for structure 2012-05-22 14:45:49 +08:00