Merge branch 'master' into refacto/vuejs_interface

modoboa/core/views/auth.py

@@ -47,8 +47,12 @@ def dologin(request):
             user = authenticate(username=form.cleaned_data["username"],
                                 password=form.cleaned_data["password"])
             if user and user.is_active:
-                if param_tools.get_global_parameter("update_scheme",
-                                                    raise_exception=False):
+                condition = (
+                    user.is_local and
+                    param_tools.get_global_parameter(
+                        "update_scheme", raise_exception=False)
+                )
+                if condition:
                     # check if password scheme is correct
                     scheme = param_tools.get_global_parameter(
                         "password_scheme", raise_exception=False)

requirements.txt

@@ -1,5 +1,5 @@
 django>=2.2,<2.3
-django-ckeditor==6.0.0
+django-ckeditor==6.1.0
 django-phonenumber-field[phonenumbers]==5.1.0
 django-reversion==3.0.9
 django-xforwardedfor-middleware==2.0