v3.0.0-beta2v3.0.0-beta2work/v3.0.0-beta2

2 files changed, 41 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75341cbd..436344c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Summary
 * Bugfix - Don't unset implicit log flush: [#9515](https://github.com/owncloud/client/pull/9515)
 * Bugfix - We fixed a crash: [#10017](https://github.com/owncloud/client/pull/10017)
 * Bugfix - Sync status changes are now directly displayed: [#10101](https://github.com/owncloud/client/issues/10101)
+* Bugfix - Windows VFS fixed some failing downloads: [#49](https://github.com/owncloud/client-desktop-vfs-win/pull/49)
 * Bugfix - Don't trigger ignore list when files are locked on the server: [#5382](https://github.com/owncloud/enterprise/issues/5382)
 * Bugfix - Properly resume upload with a partial local discovery: [#5382](https://github.com/owncloud/enterprise/issues/5382)
 * Bugfix - Add request time and other missing data to .owncloudsync.log: [#7348](https://github.com/owncloud/client/issues/7348)
@@ -23,6 +24,10 @@ Summary
 * Bugfix - Fix adding bookmarks on Gtk+ 3 based desktops: [#9752](https://github.com/owncloud/client/pull/9752)
 * Bugfix - Stop the activity spinner when the request failed: [#9798](https://github.com/owncloud/client/issues/9798)
 * Bugfix - Changes during upload of a file could still trigger the ignore list: [#9924](https://github.com/owncloud/client/issues/9924)
+* Change - Windows: Update the folder icon on every start: [#10184](https://github.com/owncloud/client/issues/10184)
+* Change - Don't guess remote folder in owncloudcmd: [#10193](https://github.com/owncloud/client/issues/10193)
+* Change - When connected to oCIS, open the browser instead of the sharing dialog: [#10206](https://github.com/owncloud/client/issues/10206)
+* Change - Owncloudcmd OCIS support: [#10239](https://github.com/owncloud/client/pull/10239)
 * Change - Make sharedialog preview be more resilient: [#8938](https://github.com/owncloud/client/issues/8938)
 * Change - We no longer persist cookies: [#9495](https://github.com/owncloud/client/issues/9495)
 * Change - We removed support for ownCloud servers < 10.0: [#9578](https://github.com/owncloud/client/issues/9578)
@@ -74,6 +79,12 @@ Details
 
    https://github.com/owncloud/client/issues/10101
 
+* Bugfix - Windows VFS fixed some failing downloads: [#49](https://github.com/owncloud/client-desktop-vfs-win/pull/49)
+
+   We fixed an api issue where some downloads in the Explorer caused infite download restarts.
+
+   https://github.com/owncloud/client-desktop-vfs-win/pull/49
+
 * Bugfix - Don't trigger ignore list when files are locked on the server: [#5382](https://github.com/owncloud/enterprise/issues/5382)
 
    https://github.com/owncloud/enterprise/issues/5382
@@ -148,6 +159,35 @@ Details
 
    https://github.com/owncloud/client/issues/9924
 
+* Change - Windows: Update the folder icon on every start: [#10184](https://github.com/owncloud/client/issues/10184)
+
+   The ownCloud installation path might have changed, causing the desktop.ini to point at the
+   wrong path. We now update the icon location on every application start.
+
+   https://github.com/owncloud/client/issues/10184
+
+* Change - Don't guess remote folder in owncloudcmd: [#10193](https://github.com/owncloud/client/issues/10193)
+
+   The commandline client was modified to explicitly accept remote folder, the remote folder
+   must no longer be encoded in the server url.
+
+   https://github.com/owncloud/client/issues/10193
+
+* Change - When connected to oCIS, open the browser instead of the sharing dialog: [#10206](https://github.com/owncloud/client/issues/10206)
+
+   When connected to oCIS, we now open the browser and navigate to the file the user wanted to share
+   instead of opening the legacy sharing dialog.
+
+   https://github.com/owncloud/client/issues/10206
+
+* Change - Owncloudcmd OCIS support: [#10239](https://github.com/owncloud/client/pull/10239)
+
+   When using ocis and spaces with the cmd client the additional parameter `--server` is
+   required. `--server` spcifies the url to the server, while the positional parameter
+   'server_url' specifies the webdav url.
+
+   https://github.com/owncloud/client/pull/10239
+
 * Change - Make sharedialog preview be more resilient: [#8938](https://github.com/owncloud/client/issues/8938)
 
    We no longer enforce png thumbnails. We no longer replace the file icon if the thumbnail is
diff --git a/VERSION.cmake b/VERSION.cmake
index 9025119d7..dbb02c9dc 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -5,7 +5,7 @@ set( MIRALL_VERSION_YEAR  2022 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "beta2") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )