Orbit/config
Lukas adc15951bb questionnaire stuff
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
..
environments change logger 2013-05-14 10:29:11 +08:00
initializers system preference 2013-04-29 15:23:15 +08:00
locales fix design index bug when start start from blank DB. 2013-05-23 12:07:43 +08:00
application.rb fronted open switch and backend openness 2013-04-23 18:48:18 +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 change logger 2013-05-14 10:29:11 +08:00
ldap.yml merge 2012-10-01 21:09:09 +08:00
list.yml back_end widget breadcrumb finish 2013-02-19 17:24:19 +08:00
mongoid.yml reverse harrys db setting 2013-04-17 14:29:56 +08:00
resque.god fix design index bug when start start from blank DB. 2013-05-23 12:07:43 +08:00
resque_schedule.god fix design index bug when start start from blank DB. 2013-05-23 12:07:43 +08:00
resque_schedule.yml system preference 2013-04-24 19:21:11 +08:00
routes.rb questionnaire stuff 2013-06-06 18:29:58 +08:00
sunspot.yml merge 2012-10-01 21:09:09 +08:00