Harry Bomrah dd4c9fc587 Merge branch 'master' into nccu ... Conflicts: .gitignore		2014-11-13 16:48:09 +08:00
..
environments	Fix production setting and update Gemfile	2014-07-07 10:58:00 +08:00
initializers	nccu branch	2014-11-07 16:06:50 +08:00
locales	update tag	2014-11-11 10:55:21 +08:00
application.rb	Rewrite member frontend, fix I18n.enforce_available_locales, update CKEditor setting	2014-07-31 15:41:28 +08:00
boot.rb	first version of theme development sdk	2014-03-12 12:42:59 +08:00
environment.rb	fix member frontend show fields	2014-11-13 11:56:50 +08:00
ldap.yml	nccu branch	2014-11-07 16:06:50 +08:00
list.yml	Member Module - User Signup Changed, Member Summary, Thumbnail	2014-05-26 11:02:13 +08:00
mongoid.yml	nccu branch	2014-11-07 16:06:50 +08:00
routes.rb	store for module store	2014-10-28 19:18:59 +08:00
store_config.yml	fixes for member show page	2014-07-02 17:37:34 +08:00
unicorn.rb	nccu branch	2014-11-07 16:06:50 +08:00