Merge branch 'master' into federate

2016-07-01 16:42:31 +02:00
parent a4d70d3046 a1edd2f31f
commit 63f5b2cabf
30 changed files with 2788 additions and 1178 deletions
--- a/cas_server/default_settings.py
+++ b/cas_server/default_settings.py
@ -90,6 +90,8 @@ setting_default(
    }
 )

+setting_default('CAS_ENABLE_AJAX_AUTH', False)
+
 setting_default('CAS_FEDERATE', False)
 # A dict of "provider suffix" -> (provider CAS server url, CAS version, verbose name)
 setting_default('CAS_FEDERATE_PROVIDERS', {})