Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine ... Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb		2012-02-29 13:07:21 +08:00
..
environments	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
initializers	ldap config for 0229 nccu demo	2012-02-29 12:35:54 +08:00
locales	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
application.rb	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
boot.rb	rails 3.1 and designs (with bug)	2011-07-12 16:00:57 +08:00
config.yml	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
database.yml.example	Add admin/pages scaffold and basic page render	2009-05-08 01:18:16 +08:00
environment.rb	changes for windows	2011-06-14 15:04:37 +08:00
list.yml	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
mongoid.yml	production mode	2011-08-25 15:59:20 +08:00
routes.rb	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00