Changed unreleased folder, version number and released notes

owncloud · Feb 5, 2024 · be778df · be778df
1 parent 3eced78
commit be778df
Show file tree

Hide file tree

Showing 33 changed files with 18 additions and 16 deletions.
diff --git a/changelog/unreleased/3966 → changelog/4.2.0_2024-02-05/3966 b/changelog/unreleased/3966 → changelog/4.2.0_2024-02-05/3966
diff --git a/changelog/unreleased/4138 → changelog/4.2.0_2024-02-05/4138 b/changelog/unreleased/4138 → changelog/4.2.0_2024-02-05/4138
diff --git a/changelog/unreleased/4143 → changelog/4.2.0_2024-02-05/4143 b/changelog/unreleased/4143 → changelog/4.2.0_2024-02-05/4143
diff --git a/changelog/unreleased/4160 → changelog/4.2.0_2024-02-05/4160 b/changelog/unreleased/4160 → changelog/4.2.0_2024-02-05/4160
diff --git a/changelog/unreleased/4179 → changelog/4.2.0_2024-02-05/4179 b/changelog/unreleased/4179 → changelog/4.2.0_2024-02-05/4179
diff --git a/changelog/unreleased/4183 → changelog/4.2.0_2024-02-05/4183 b/changelog/unreleased/4183 → changelog/4.2.0_2024-02-05/4183
diff --git a/changelog/unreleased/4187 → changelog/4.2.0_2024-02-05/4187 b/changelog/unreleased/4187 → changelog/4.2.0_2024-02-05/4187
diff --git a/changelog/unreleased/4191 → changelog/4.2.0_2024-02-05/4191 b/changelog/unreleased/4191 → changelog/4.2.0_2024-02-05/4191
diff --git a/changelog/unreleased/4199 → changelog/4.2.0_2024-02-05/4199 b/changelog/unreleased/4199 → changelog/4.2.0_2024-02-05/4199
diff --git a/changelog/unreleased/4204 → changelog/4.2.0_2024-02-05/4204 b/changelog/unreleased/4204 → changelog/4.2.0_2024-02-05/4204
diff --git a/changelog/unreleased/4205 → changelog/4.2.0_2024-02-05/4205 b/changelog/unreleased/4205 → changelog/4.2.0_2024-02-05/4205
diff --git a/changelog/unreleased/4209 → changelog/4.2.0_2024-02-05/4209 b/changelog/unreleased/4209 → changelog/4.2.0_2024-02-05/4209
diff --git a/changelog/unreleased/4212 → changelog/4.2.0_2024-02-05/4212 b/changelog/unreleased/4212 → changelog/4.2.0_2024-02-05/4212
diff --git a/changelog/unreleased/4214 → changelog/4.2.0_2024-02-05/4214 b/changelog/unreleased/4214 → changelog/4.2.0_2024-02-05/4214
diff --git a/changelog/unreleased/4215 → changelog/4.2.0_2024-02-05/4215 b/changelog/unreleased/4215 → changelog/4.2.0_2024-02-05/4215
diff --git a/changelog/unreleased/4237 → changelog/4.2.0_2024-02-05/4237 b/changelog/unreleased/4237 → changelog/4.2.0_2024-02-05/4237
diff --git a/changelog/unreleased/4238 → changelog/4.2.0_2024-02-05/4238 b/changelog/unreleased/4238 → changelog/4.2.0_2024-02-05/4238
diff --git a/changelog/unreleased/4241 → changelog/4.2.0_2024-02-05/4241 b/changelog/unreleased/4241 → changelog/4.2.0_2024-02-05/4241
diff --git a/changelog/unreleased/4257 → changelog/4.2.0_2024-02-05/4257 b/changelog/unreleased/4257 → changelog/4.2.0_2024-02-05/4257
diff --git a/changelog/unreleased/4260 → changelog/4.2.0_2024-02-05/4260 b/changelog/unreleased/4260 → changelog/4.2.0_2024-02-05/4260
diff --git a/changelog/unreleased/4265 → changelog/4.2.0_2024-02-05/4265 b/changelog/unreleased/4265 → changelog/4.2.0_2024-02-05/4265
diff --git a/changelog/unreleased/4266 → changelog/4.2.0_2024-02-05/4266 b/changelog/unreleased/4266 → changelog/4.2.0_2024-02-05/4266
diff --git a/changelog/unreleased/4276 → changelog/4.2.0_2024-02-05/4276 b/changelog/unreleased/4276 → changelog/4.2.0_2024-02-05/4276
diff --git a/changelog/unreleased/4277 → changelog/4.2.0_2024-02-05/4277 b/changelog/unreleased/4277 → changelog/4.2.0_2024-02-05/4277
diff --git a/changelog/unreleased/4283 → changelog/4.2.0_2024-02-05/4283 b/changelog/unreleased/4283 → changelog/4.2.0_2024-02-05/4283
diff --git a/changelog/unreleased/4285 → changelog/4.2.0_2024-02-05/4285 b/changelog/unreleased/4285 → changelog/4.2.0_2024-02-05/4285
diff --git a/changelog/unreleased/4287 → changelog/4.2.0_2024-02-05/4287 b/changelog/unreleased/4287 → changelog/4.2.0_2024-02-05/4287
diff --git a/changelog/unreleased/4291 → changelog/4.2.0_2024-02-05/4291 b/changelog/unreleased/4291 → changelog/4.2.0_2024-02-05/4291
diff --git a/changelog/unreleased/4294 → changelog/4.2.0_2024-02-05/4294 b/changelog/unreleased/4294 → changelog/4.2.0_2024-02-05/4294
diff --git a/changelog/unreleased/4295 → changelog/4.2.0_2024-02-05/4295 b/changelog/unreleased/4295 → changelog/4.2.0_2024-02-05/4295
diff --git a/changelog/unreleased/4297 → changelog/4.2.0_2024-02-05/4297 b/changelog/unreleased/4297 → changelog/4.2.0_2024-02-05/4297
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -96,8 +96,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 41000101
-        versionName = "4.2-beta.1"
+        versionCode = 42000000
+        versionName = "4.2.0"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml
@@ -727,20 +727,22 @@
     <string name="release_notes_proceed">Proceed</string>
     <string name="release_notes_icon">Release note icon</string>
 
-    <string name="release_notes_4_2_0_title_1">Opening files from outside the app using links</string>
-    <string name="release_notes_4_2_0_subtitle_1">A link that points to the app will open the app and then, resolve the file to preview it directly</string>
-    <string name="release_notes_4_2_0_title_2">"Share to" in oCIS accounts allows to upload to any space</string>
-    <string name="release_notes_4_2_0_subtitle_2">Shared files from other apps can be uploaded to any space and not only the Personal one in oCIS accounts</string>
-    <string name="release_notes_4_2_0_title_3">"Apply to all" for conflicts</string>
-    <string name="release_notes_4_2_0_subtitle_3">New dialog to fix all conflicts at once</string>
-    <string name="release_notes_4_2_0_title_4">Auto-refresh when a file is uploaded</string>
-    <string name="release_notes_4_2_0_subtitle_4">The file list will be now refreshed automatically while uploading to the target folder</string>
-    <string name="release_notes_4_2_0_title_5">Download log files</string>
-    <string name="release_notes_4_2_0_subtitle_5">New option to download a log file to the Downloads folder of the device</string>
-    <string name="release_notes_4_2_0_title_6">Minor bugfixes</string>
-    <string name="release_notes_4_2_0_subtitle_6">Some bugs were fixed to improve experience in the app</string>
-    <string name="release_notes_4_2_0_title_7">Auto uploads to spaces</string>
-    <string name="release_notes_4_2_0_subtitle_7">Photos and videos from camera now saved inside spaces, not only in Personal</string>
+    <string name="release_notes_4_2_0_title_1">Latest version with support for Android 6.0</string>
+    <string name="release_notes_4_2_0_subtitle_1">The 4.2.0 version of the app will be the last one that supports Android 6.0</string>
+    <string name="release_notes_4_2_0_title_2">Opening files from outside the app using links</string>
+    <string name="release_notes_4_2_0_subtitle_2">A link that points to the app will open the app and then, resolve the file to preview it directly</string>
+    <string name="release_notes_4_2_0_title_3">"Share to" in oCIS accounts allows to upload to any space</string>
+    <string name="release_notes_4_2_0_subtitle_3">Shared files from other apps can be uploaded to any space and not only the Personal one in oCIS accounts</string>
+    <string name="release_notes_4_2_0_title_4">"Apply to all" for conflicts</string>
+    <string name="release_notes_4_2_0_subtitle_4">New dialog to fix all conflicts at once</string>
+    <string name="release_notes_4_2_0_title_5">Auto-refresh when a file is uploaded</string>
+    <string name="release_notes_4_2_0_subtitle_5">The file list will be now refreshed automatically while uploading to the target folder</string>
+    <string name="release_notes_4_2_0_title_6">Download log files</string>
+    <string name="release_notes_4_2_0_subtitle_6">New option to download a log file to the Downloads folder of the device</string>
+    <string name="release_notes_4_2_0_title_7">Minor bugfixes</string>
+    <string name="release_notes_4_2_0_subtitle_7">Some bugs were fixed to improve experience in the app</string>
+    <string name="release_notes_4_2_0_title_8">Auto uploads to spaces</string>
+    <string name="release_notes_4_2_0_subtitle_8">Photos and videos from camera now saved inside spaces, not only in Personal</string>
 
     <!-- Open in web -->
     <string name="ic_action_open_in_web">Open in web</string>