Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ... Conflicts: config/environments/development.rb		2012-03-01 10:13:49 +08:00
..
environments	Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap	2012-03-01 10:13:49 +08:00
initializers	ldap config for 0229 nccu demo	2012-02-29 12:35:54 +08:00
locales	Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap	2012-03-01 10:13:49 +08:00
application.rb	Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap	2012-03-01 10:13:49 +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	for different database for demo	2012-02-29 13:15:25 +08:00
routes.rb	fix bugs with token	2012-02-29 18:56:42 +08:00