saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views
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
..
admin Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
desktop Page added for desktop 2012-08-20 23:17:31 +08:00
devise Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
layouts Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
shared Add missing translations 2012-09-24 09:02:46 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
seminar_p.html.erb Added seminar section 2012-07-04 19:12:02 +08:00