From 7eac499f5f6581f69d86593c7ba2788c73c14b83 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Wed, 14 Nov 2018 15:43:47 +0100
Subject: [PATCH 1/5] Updates mockito version.

Allows for usage with junit jupiter in plugins.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e0e4646e9b..e480d1527b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,7 +741,7 @@
 
   <properties>
     <!-- test libraries -->
-    <mockito.version>2.10.0</mockito.version>
+    <mockito.version>2.23.0</mockito.version>
     <hamcrest.version>1.3</hamcrest.version>
     <junit.version>5.2.0</junit.version>
 

From f742ecef93c349700cea2844f6d81dc33bdff995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 15 Nov 2018 10:03:25 +0100
Subject: [PATCH 2/5] put active as default at user creation

---
 scm-ui/src/users/components/UserForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 2b8aa7b1e8..c2a8cfd089 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -38,7 +38,7 @@ class UserForm extends React.Component<Props, State> {
         mail: "",
         password: "",
         admin: false,
-        active: false,
+        active: true,
         _links: {}
       },
       mailValidationError: false,

From ae16482e619cc9e446fba41bfe3cbd1be67ab95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Thu, 15 Nov 2018 10:05:11 +0100
Subject: [PATCH 3/5] only allow to add user if mail is set - backend throws
 error if mail is not set

---
 scm-ui/src/users/components/UserForm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index c2a8cfd089..0f2407f192 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -73,7 +73,8 @@ class UserForm extends React.Component<Props, State> {
       this.state.passwordConfirmationError ||
       this.state.displayNameValidationError ||
       this.isFalsy(user.name) ||
-      this.isFalsy(user.displayName)
+      this.isFalsy(user.displayName) ||
+      this.isFalsy(user.mail)
     );
   };
 

From 4cb869ae6af8679c4966d7343633264500db86e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 15 Nov 2018 14:36:56 +0000
Subject: [PATCH 4/5] Close branch feature/ui-add-user-active-as-default


From 51c9a4dbb2d65a456e179fe9f07f7e6f6d7426b9 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 15 Nov 2018 19:28:17 +0100
Subject: [PATCH 5/5] do not try to load i18n for en_US, use language only: en

---
 scm-ui/src/i18n.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scm-ui/src/i18n.js b/scm-ui/src/i18n.js
index f4388bd141..b0898eaabb 100644
--- a/scm-ui/src/i18n.js
+++ b/scm-ui/src/i18n.js
@@ -15,11 +15,14 @@ i18n
   .init({
     fallbackLng: "en",
 
+    // try to load only "en" and not "en_US"
+    load: "languageOnly",
+
     // have a common namespace used around the full app
     ns: ["commons"],
     defaultNS: "commons",
 
-    debug: true,
+    debug: false,
 
     interpolation: {
       escapeValue: false // not needed for react!!