Matt K. Fu 0f6f5aafce fix for both part and page part settings ... Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb		2013-04-17 14:12:52 +08:00
..
environments	fixed desktop route	2013-01-07 16:38:02 +08:00
initializers	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
locales	Delete NTU's i18n	2013-03-27 16:30:35 +08:00
application.rb	Add path for i18n	2012-12-06 17:27:36 +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	back_end widget breadcrumb finish	2013-02-19 17:24:19 +08:00
mongoid.yml	fix for both part and page part settings	2013-04-17 14:12:52 +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	Remove nccu's backup db schedule	2013-03-19 23:44:02 +08:00
routes.rb	fix for both part and page part settings	2013-04-17 14:12:52 +08:00
sunspot.yml	merge	2012-10-01 21:09:09 +08:00