Merge remote-tracking branch 'origin/master'

docs/conf.py

@@ -15,8 +15,6 @@
 import sys
 import os
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -107,10 +105,14 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-if on_rtd:
+if os.environ.get('READTHEDOCS', None) == 'True':
     html_theme = 'default'
 else:
-    html_theme = 'alabaster'
+    try:
+        import alabaster
+        html_theme = 'alabaster'
+    except ImportErrror:
+        html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

weblate/accounts/pipeline.py

@@ -125,7 +125,7 @@ def verify_open(strategy, backend, user=None, **kwargs):
         raise AuthException(backend, _('New registrations are disabled!'))
 
 
-def verify_username(strategy, backend, user, social, details, **kwargs):
+def verify_username(strategy, backend, social, details, user=None, **kwargs):
     """Verified whether username is still free.
 
     It can happen that user has registered several times or other user has

weblate/static/loader-bootstrap.js

@@ -2,7 +2,7 @@ var loading = 0;
 var machineTranslationLoaded = false;
 var activityDataLoaded = false;
 
-if (window.location.hash && window.location.hash === '#_=_') {
+if (window.location.hash && (window.location.hash === '#_=_' || window.location.hash.indexOf("=") > -1)) {
     window.location.hash = '';
 }