Merge branch 'release/0.3.4'

hpi-schul-cloud · Oct 28, 2019 · 51304e5 · 51304e5
2 parents 0df9168 + 5f1f459
commit 51304e5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/app/src/main/java/org/schulcloud/mobile/models/Credentials.kt b/app/src/main/java/org/schulcloud/mobile/models/Credentials.kt
@@ -1,4 +1,9 @@
 package org.schulcloud.mobile.models
 
 
-data class Credentials(var username: String, var password: String)
+data class Credentials(
+        var username: String,
+        var password: String
+) {
+    val strategy = "local"
+}
diff --git a/app/src/main/res/raw-en/changelog.xml b/app/src/main/res/raw-en/changelog.xml
@@ -36,4 +36,11 @@
         <fix>Removed link sharing</fix>
     </release>
 
+    <release
+        date="2019-10-28"
+        versionCode="3004"
+        versionName="Version 0.3.4">
+        <fix>Fix login</fix>
+    </release>
+
 </changelog>
diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -38,4 +38,11 @@
         <fix>Teilen von Links wurde entfernt</fix>
     </release>
 
+    <release
+        date="28.10.2019"
+        versionCode="3004"
+        versionName="Version 0.3.4">
+        <fix>Loginprobleme behoben</fix>
+    </release>
+
 </changelog>
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         targetSdkVersion = 28
         compileSdkVersion = 28
 
-        versionName = '0.3.3'
-        versionCode = 3003
+        versionName = '0.3.4'
+        versionCode = 3004
     }
     repositories {
         google()