diff --git a/changelog/unreleased/3966 b/changelog/4.2.0_2024-02-05/3966 similarity index 100% rename from changelog/unreleased/3966 rename to changelog/4.2.0_2024-02-05/3966 diff --git a/changelog/unreleased/4138 b/changelog/4.2.0_2024-02-05/4138 similarity index 100% rename from changelog/unreleased/4138 rename to changelog/4.2.0_2024-02-05/4138 diff --git a/changelog/unreleased/4143 b/changelog/4.2.0_2024-02-05/4143 similarity index 100% rename from changelog/unreleased/4143 rename to changelog/4.2.0_2024-02-05/4143 diff --git a/changelog/unreleased/4160 b/changelog/4.2.0_2024-02-05/4160 similarity index 100% rename from changelog/unreleased/4160 rename to changelog/4.2.0_2024-02-05/4160 diff --git a/changelog/unreleased/4179 b/changelog/4.2.0_2024-02-05/4179 similarity index 100% rename from changelog/unreleased/4179 rename to changelog/4.2.0_2024-02-05/4179 diff --git a/changelog/unreleased/4183 b/changelog/4.2.0_2024-02-05/4183 similarity index 100% rename from changelog/unreleased/4183 rename to changelog/4.2.0_2024-02-05/4183 diff --git a/changelog/unreleased/4187 b/changelog/4.2.0_2024-02-05/4187 similarity index 100% rename from changelog/unreleased/4187 rename to changelog/4.2.0_2024-02-05/4187 diff --git a/changelog/unreleased/4191 b/changelog/4.2.0_2024-02-05/4191 similarity index 100% rename from changelog/unreleased/4191 rename to changelog/4.2.0_2024-02-05/4191 diff --git a/changelog/unreleased/4199 b/changelog/4.2.0_2024-02-05/4199 similarity index 100% rename from changelog/unreleased/4199 rename to changelog/4.2.0_2024-02-05/4199 diff --git a/changelog/unreleased/4204 b/changelog/4.2.0_2024-02-05/4204 similarity index 100% rename from changelog/unreleased/4204 rename to changelog/4.2.0_2024-02-05/4204 diff --git a/changelog/unreleased/4205 b/changelog/4.2.0_2024-02-05/4205 similarity index 100% rename from changelog/unreleased/4205 rename to changelog/4.2.0_2024-02-05/4205 diff --git a/changelog/unreleased/4209 b/changelog/4.2.0_2024-02-05/4209 similarity index 100% rename from changelog/unreleased/4209 rename to changelog/4.2.0_2024-02-05/4209 diff --git a/changelog/unreleased/4212 b/changelog/4.2.0_2024-02-05/4212 similarity index 100% rename from changelog/unreleased/4212 rename to changelog/4.2.0_2024-02-05/4212 diff --git a/changelog/unreleased/4214 b/changelog/4.2.0_2024-02-05/4214 similarity index 100% rename from changelog/unreleased/4214 rename to changelog/4.2.0_2024-02-05/4214 diff --git a/changelog/unreleased/4215 b/changelog/4.2.0_2024-02-05/4215 similarity index 100% rename from changelog/unreleased/4215 rename to changelog/4.2.0_2024-02-05/4215 diff --git a/changelog/unreleased/4237 b/changelog/4.2.0_2024-02-05/4237 similarity index 100% rename from changelog/unreleased/4237 rename to changelog/4.2.0_2024-02-05/4237 diff --git a/changelog/unreleased/4238 b/changelog/4.2.0_2024-02-05/4238 similarity index 100% rename from changelog/unreleased/4238 rename to changelog/4.2.0_2024-02-05/4238 diff --git a/changelog/unreleased/4241 b/changelog/4.2.0_2024-02-05/4241 similarity index 100% rename from changelog/unreleased/4241 rename to changelog/4.2.0_2024-02-05/4241 diff --git a/changelog/unreleased/4257 b/changelog/4.2.0_2024-02-05/4257 similarity index 100% rename from changelog/unreleased/4257 rename to changelog/4.2.0_2024-02-05/4257 diff --git a/changelog/unreleased/4260 b/changelog/4.2.0_2024-02-05/4260 similarity index 100% rename from changelog/unreleased/4260 rename to changelog/4.2.0_2024-02-05/4260 diff --git a/changelog/unreleased/4265 b/changelog/4.2.0_2024-02-05/4265 similarity index 100% rename from changelog/unreleased/4265 rename to changelog/4.2.0_2024-02-05/4265 diff --git a/changelog/unreleased/4266 b/changelog/4.2.0_2024-02-05/4266 similarity index 100% rename from changelog/unreleased/4266 rename to changelog/4.2.0_2024-02-05/4266 diff --git a/changelog/unreleased/4276 b/changelog/4.2.0_2024-02-05/4276 similarity index 100% rename from changelog/unreleased/4276 rename to changelog/4.2.0_2024-02-05/4276 diff --git a/changelog/unreleased/4277 b/changelog/4.2.0_2024-02-05/4277 similarity index 100% rename from changelog/unreleased/4277 rename to changelog/4.2.0_2024-02-05/4277 diff --git a/changelog/unreleased/4283 b/changelog/4.2.0_2024-02-05/4283 similarity index 100% rename from changelog/unreleased/4283 rename to changelog/4.2.0_2024-02-05/4283 diff --git a/changelog/unreleased/4285 b/changelog/4.2.0_2024-02-05/4285 similarity index 100% rename from changelog/unreleased/4285 rename to changelog/4.2.0_2024-02-05/4285 diff --git a/changelog/unreleased/4287 b/changelog/4.2.0_2024-02-05/4287 similarity index 100% rename from changelog/unreleased/4287 rename to changelog/4.2.0_2024-02-05/4287 diff --git a/changelog/unreleased/4291 b/changelog/4.2.0_2024-02-05/4291 similarity index 100% rename from changelog/unreleased/4291 rename to changelog/4.2.0_2024-02-05/4291 diff --git a/changelog/unreleased/4294 b/changelog/4.2.0_2024-02-05/4294 similarity index 100% rename from changelog/unreleased/4294 rename to changelog/4.2.0_2024-02-05/4294 diff --git a/changelog/unreleased/4295 b/changelog/4.2.0_2024-02-05/4295 similarity index 100% rename from changelog/unreleased/4295 rename to changelog/4.2.0_2024-02-05/4295 diff --git a/changelog/unreleased/4297 b/changelog/4.2.0_2024-02-05/4297 similarity index 100% rename from changelog/unreleased/4297 rename to changelog/4.2.0_2024-02-05/4297 diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 5f25f6de6a0..2127bab7356 100644 --- 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/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt index 8673f72db63..df26ef507c9 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt @@ -48,7 +48,7 @@ class ReleaseNotesViewModel( ReleaseNote( title = R.string.release_notes_4_2_0_title_1, subtitle = R.string.release_notes_4_2_0_subtitle_1, - type = ReleaseNoteType.ENHANCEMENT, + type = ReleaseNoteType.CHANGE, ), ReleaseNote( title = R.string.release_notes_4_2_0_title_2, @@ -78,8 +78,18 @@ class ReleaseNotesViewModel( ReleaseNote( title = R.string.release_notes_4_2_0_title_6, subtitle = R.string.release_notes_4_2_0_subtitle_6, + type = ReleaseNoteType.ENHANCEMENT, + ), + ReleaseNote( + title = R.string.release_notes_4_2_0_title_7, + subtitle = R.string.release_notes_4_2_0_subtitle_7, type = ReleaseNoteType.BUGFIX, ), + ReleaseNote( + title = R.string.release_notes_4_2_0_title_8, + subtitle = R.string.release_notes_4_2_0_subtitle_8, + type = ReleaseNoteType.ENHANCEMENT, + ), ) } } diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index dfc8d6b6281..27ad16eec23 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -727,20 +727,22 @@ Proceed Release note icon - Opening files from outside the app using links - A link that points to the app will open the app and then, resolve the file to preview it directly - "Share to" in oCIS accounts allows to upload to any space - Shared files from other apps can be uploaded to any space and not only the Personal one in oCIS accounts - "Apply to all" for conflicts - New dialog to fix all conflicts at once - Auto-refresh when a file is uploaded - The file list will be now refreshed automatically while uploading to the target folder - Download log files - New option to download a log file to the Downloads folder of the device - Minor bugfixes - Some bugs were fixed to improve experience in the app - Auto uploads to spaces - Photos and videos from camera now saved inside spaces, not only in Personal + Latest version with support for Android 6.x + The 4.2.0 version of the application is the latest version that will support Android 6.x. + Opening files from outside the app using links + A link that points to the app will open the app and then, resolve the file to preview it directly + "Share to" in oCIS accounts allows to upload to any space + Shared files from other apps can be uploaded to any space and not only the Personal one in oCIS accounts + "Apply to all" for conflicts + New dialog to fix all conflicts at once + Auto-refresh when a file is uploaded + The file list will be now refreshed automatically while uploading to the target folder + Download log files + New option to download a log file to the Downloads folder of the device + Minor bugfixes + Some bugs were fixed to improve experience in the app + Auto uploads to spaces + Photos and videos from camera now saved inside spaces, not only in Personal Open in web