Commit 55dd7f2a authored by root's avatar root

1) sync with trunk

2) disable oauthauth (twitter) and facebookauth openID authentication
parents 14c4805c d207cb0b
This diff is collapsed.
...@@ -60,4 +60,4 @@ DJANGO_VERSION = 1.3 ...@@ -60,4 +60,4 @@ DJANGO_VERSION = 1.3
OSQA_DEFAULT_SKIN = 'default' OSQA_DEFAULT_SKIN = 'default'
# disable mysqlfulltxt and local authentication (registrations users) # disable mysqlfulltxt and local authentication (registrations users)
DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth'] DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth', 'oauthauth', 'facebookauth']
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment