Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb		2012-05-22 20:33:07 +08:00
..
environments	Changes on nccu	2012-05-18 15:20:45 +08:00
initializers	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00
locales	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
application.rb	God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.	2012-05-08 20:21:28 +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
dump.rdb	Nccu calendar and daily job.	2012-05-15 14:03:54 +08:00
environment.rb	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
list.yml	Add sub_menu in r_tags	2012-04-24 02:30:40 +08:00
mongoid.yml	Put back db prototype_r4_development	2012-05-18 16:46:47 +08:00
resque.god	God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.	2012-05-08 20:21:28 +08:00
resque_schedule.yml	Restart job	2012-05-14 00:50:36 +08:00
routes.rb	Merge branch 'design_team' into ldap	2012-05-17 06:46:29 +08:00