diff -r adc5311b1b0d -r 993f18158ccb src/ldtplatform/settings.py --- a/src/ldtplatform/settings.py Wed May 27 12:47:39 2015 +0200 +++ b/src/ldtplatform/settings.py Thu May 28 11:07:24 2015 +0200 @@ -66,7 +66,6 @@ # trailing slash. # Examples: "http://foo.com/media/", "/media/". -#LDT_MEDIA_PREFIX = '/ldt/' # Make this unique, and don't share it with anybody. SECRET_KEY = 't^lii5_z@tho$%6t&b#dm#t9nz$$ylyclxvkdiyqbl+(dnt(ma' @@ -154,10 +153,6 @@ 'metadatacomposer', ) -MIGRATION_MODULES = { - "registration": "app_migrations.registration", -} - #AUTH_PROFILE_MODULE = 'user.UserProfile' AUTH_USER_MODEL = 'user.LdtUser' @@ -172,12 +167,6 @@ ) AUTHENTICATION_BACKENDS = ( - 'social.backends.open_id.OpenIdAuth', - 'social.backends.google.GoogleOpenId', - #'social.backends.google.GoogleOAuth2', - #'social.backends.google.GoogleOAuth', - 'social.backends.twitter.TwitterOAuth', - 'social.backends.facebook.FacebookOAuth2', 'guardian.backends.ObjectPermissionBackend', 'django.contrib.auth.backends.ModelBackend', ) @@ -205,15 +194,10 @@ OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888" -SOCIAL_AUTH_TWITTER_KEY = 'UxAdbOLSo4Mx3CXIwDG9Eg' -SOCIAL_AUTH_TWITTER_SECRET = '2PcWgdjnJL6Vp8srB40jeAo0fjMEtDnUwmAia6EUww' -SOCIAL_AUTH_FACEBOOK_KEY = '163134140411313' -SOCIAL_AUTH_FACEBOOK_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012' SOCIAL_AUTH_COMPLETE_URL_NAME = 'complete' SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete' - AUTO_INDEX_AFTER_SAVE = True ANONYMOUS_USER_ID = -1 @@ -273,9 +257,6 @@ if not "LOGIN_ERROR_URL" in locals(): LOGIN_ERROR_URL = SRC_BASE_URL + 'accounts/login' -# Used in a lot of templates -if not "LDT_MEDIA_PREFIX" in locals(): - LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' # URL that handles the media served from MEDIA_ROOT. if not "MEDIA_URL" in locals(): MEDIA_URL = BASE_URL + 'static/media/'