1) sync with trunk

2) disable oauthauth (twitter) and facebookauth openID authentication

1) sync with trunk
2) disable oauthauth (twitter) and facebookauth openID authentication
55dd7f2a · root · 14c4805c · d207cb0b · 55dd7f2a · 55dd7f2a
Commit 55dd7f2a authored Jul 05, 2012 by root
Expand all Show whitespace changes
Inline Side-by-side

Showing with 109 additions and 80 deletions

locale/it/LC_MESSAGES/it.po locale/it/LC_MESSAGES/it.po +108 -79

settings_local.py settings_local.py +1 -1

No files found.
--- a/locale/it/LC_MESSAGES/it.po
+++ b/locale/it/LC_MESSAGES/it.po
--- a/settings_local.py
+++ b/settings_local.py
@@ -60,4 +60,4 @@ DJANGO_VERSION = 1.3
 OSQA_DEFAULT_SKIN = 'default'

 # 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']