developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/config
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
..
environments Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
initializers Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
locales Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
application.rb new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
boot.rb rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
config.yml close alpha on nccu 2012-03-20 14:38:01 +08:00
database.yml.example Add admin/pages scaffold and basic page render 2009-05-08 01:18:16 +08:00
environment.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
ldap.yml merge 2012-10-01 21:09:09 +08:00
list.yml member for THU 2012-10-26 11:19:56 +08:00
mongoid.yml Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
resque.god merge 2012-10-01 21:09:09 +08:00
resque_schedule.god add rescue job . can work with init script 2012-06-29 17:42:36 +08:00
resque_schedule.yml fix over queue at resque 2012-07-03 10:51:26 +08:00
routes.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
sunspot.yml merge 2012-10-01 21:09:09 +08:00