23 files changed, 523 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 013de6d9f..9f2aea6b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,424 @@
-Changelog for ownCloud Desktop Client [unreleased] (UNRELEASED)
+Changelog for ownCloud Desktop Client [2.10.0] (2022-01-17)
 =======================================
-The following sections list the changes in ownCloud Desktop Client unreleased relevant to
+The following sections list the changes in ownCloud Desktop Client 2.10.0 relevant to
 ownCloud admins and users.
 
-[unreleased]: https://github.com/owncloud/client/compare/v2.8.2...master
+[2.10.0]: https://github.com/owncloud/client/compare/v2.9.2...v2.10.0
+
+Summary
+-------
+
+* Bugfix - Issues with long file path: [#4896](https://github.com/owncloud/enterprise/issues/4896)
+* Bugfix - Do not ask for credentails at start-up when the user logged out: [#8924](https://github.com/owncloud/client/issues/8924)
+* Bugfix - A folder moved on the server was displayed as outdated: [#9071](https://github.com/owncloud/client/issues/9071)
+* Bugfix - Immediately propagate changes to the ignore list: [#8975](https://github.com/owncloud/client/issues/8975)
+* Bugfix - Fix icon name in desktop file with ownBrander themes: [#8992](https://github.com/owncloud/client/issues/8992)
+* Bugfix - Crash when handling locked files: [#9170](https://github.com/owncloud/client/issues/9170)
+* Bugfix - Don't abort upload if chunk is locked: [#9194](https://github.com/owncloud/client/issues/9194)
+* Bugfix - Always restart OAuth2 on error: [#9196](https://github.com/owncloud/client/issues/9196)
+* Bugfix - Display correct error message for files containign `\:?*"<>|`: [#9223](https://github.com/owncloud/client/pull/9223/)
+* Bugfix - Do not sync when unsyncedfolders file cannot be read: [#9165](https://github.com/owncloud/client/issues/9165)
+* Bugfix - Fix failing dehydration causing files to be moved to trash: [#9257](https://github.com/owncloud/client/pull/9257)
+* Bugfix - Do not show Activity tab if server app is disabled or uninstalled: [#9260](https://github.com/owncloud/client/issues/9260)
+* Bugfix - Handle file locks for delete jobs: [#9293](https://github.com/owncloud/client/issues/9293)
+* Bugfix - Run a full local discovery after we where paused or on a forced sync: [#9341](https://github.com/owncloud/client/issues/9341)
+* Bugfix - Infinite sync loop if folder is locked: [#9342](https://github.com/owncloud/client/issues/9342)
+* Bugfix - We fixed a possible crash: [#13](https://github.com/owncloud/client-desktop-vfs-win/pull/13)
+* Enhancement - Reintroduce issue filtering: [#9000](https://github.com/owncloud/client/issues/9000)
+* Enhancement - Allow to remove broken sync folders: [#9099](https://github.com/owncloud/client/pull/9099)
+* Enhancement - Also ignore local reapeating errors for a period of time: [#9208](https://github.com/owncloud/client/issues/9208)
+* Enhancement - Remove the availability menu from the ui: [#9291](https://github.com/owncloud/client/pull/9291)
+* Enhancement - Add the syncroot to the search indexed with Windows VFS: [#12](https://github.com/owncloud/client-desktop-vfs-win/pull/12)
+
+Details
+-------
+
+* Bugfix - Issues with long file path: [#4896](https://github.com/owncloud/enterprise/issues/4896)
+
+   We fixed another issue with long Windows paths.
+
+   https://github.com/owncloud/enterprise/issues/4896
+
+* Bugfix - Do not ask for credentails at start-up when the user logged out: [#8924](https://github.com/owncloud/client/issues/8924)
+
+   When a user would logout, and quit the client, then on the next start the client would
+   immediately ask for credentials. This has been fixed by storing the fact that the user logged
+   out before in the account settings.
+
+   https://github.com/owncloud/client/issues/8924
+
+* Bugfix - A folder moved on the server was displayed as outdated: [#9071](https://github.com/owncloud/client/issues/9071)
+
+   We fixed a bug where a folder moved on the server was displayed as outdated.
+
+   https://github.com/owncloud/client/issues/9071
+
+* Bugfix - Immediately propagate changes to the ignore list: [#8975](https://github.com/owncloud/client/issues/8975)
+
+   Previously, when changing the ignore list, those changes would not be propagated to existing
+   sync folders. Only after restarting the client, would these changes be applied.
+
+   https://github.com/owncloud/client/issues/8975
+   https://github.com/owncloud/client/pull/9149
+
+* Bugfix - Fix icon name in desktop file with ownBrander themes: [#8992](https://github.com/owncloud/client/issues/8992)
+
+   Fixes broken icon reference in desktop entries for some branded build themes.
+
+   https://github.com/owncloud/client/issues/8992
+   https://github.com/owncloud/client/pull/9150
+
+* Bugfix - Crash when handling locked files: [#9170](https://github.com/owncloud/client/issues/9170)
+
+   We fixed a crash that could occur when trying to add a locked folder to the databse.
+
+   https://github.com/owncloud/client/issues/9170
+
+* Bugfix - Don't abort upload if chunk is locked: [#9194](https://github.com/owncloud/client/issues/9194)
+
+   Since 2.9 we know that we need exclusive file access to a file to properly handle it with Windows
+   virtual files. Therefore we checked for the locked state before we start the upload. Due to a bug
+   we checked that for each file chunk, now we only check when the upload starts and when it finished
+   completely.
+
+   https://github.com/owncloud/client/issues/9194
+   https://github.com/owncloud/client/pull/9264
+   https://github.com/owncloud/client/pull/9296
+
+* Bugfix - Always restart OAuth2 on error: [#9196](https://github.com/owncloud/client/issues/9196)
+
+   We now always restart the OAuth2 process once we got a result. This will ensure that a second try
+   after an error occurred can succeed.
+
+   https://github.com/owncloud/client/issues/9196
+
+* Bugfix - Display correct error message for files containign `\:?*"<>|`: [#9223](https://github.com/owncloud/client/pull/9223/)
+
+   While the error message was supposed to be: `File names containing the character '%1' are not
+   supported on this file system.`
+
+   We displayed: `The file name is a reserved name on this file system.`
+
+   https://github.com/owncloud/client/pull/9223/
+
+* Bugfix - Do not sync when unsyncedfolders file cannot be read: [#9165](https://github.com/owncloud/client/issues/9165)
+
+   Owncloudcmd now checks if the file specified by --unsyncedfolders exists and can be read,
+   before starting the sync. If it does not exist, show an error message and quit immediately.
+
+   https://github.com/owncloud/client/issues/9165
+   https://github.com/owncloud/client/pull/9241
+
+* Bugfix - Fix failing dehydration causing files to be moved to trash: [#9257](https://github.com/owncloud/client/pull/9257)
+
+   If files where dehydrated by the user the action could fail under certain conditions which
+   caused a deletion of the file.
+
+   https://github.com/owncloud/client/pull/9257
+   https://github.com/owncloud/client-desktop-vfs-win/pull/9
+
+* Bugfix - Do not show Activity tab if server app is disabled or uninstalled: [#9260](https://github.com/owncloud/client/issues/9260)
+
+   The Activity app API nowadays returns error responses in case the app is disabled or
+   uninstalled. This new behavior is now supported in the client.
+
+   https://github.com/owncloud/client/issues/9260
+   https://github.com/owncloud/client/pull/9266
+
+* Bugfix - Handle file locks for delete jobs: [#9293](https://github.com/owncloud/client/issues/9293)
+
+   We no longer report an error when the client tries to delete a locked file but wait for the lock to
+   be removed.
+
+   This only works when a file is deleted not on folders.
+
+   https://github.com/owncloud/client/issues/9293
+   https://github.com/owncloud/client/pull/9295
+
+* Bugfix - Run a full local discovery after we where paused or on a forced sync: [#9341](https://github.com/owncloud/client/issues/9341)
+
+   Previously we did a incremental search wich might have skipped some local changes.
+
+   https://github.com/owncloud/client/issues/9341
+
+* Bugfix - Infinite sync loop if folder is locked: [#9342](https://github.com/owncloud/client/issues/9342)
+
+   We fixed a bug that caused an infinite sync loop if an error occured.
+
+   https://github.com/owncloud/client/issues/9342
+   https://github.com/owncloud/client-desktop-vfs-win/pull/14
+
+* Bugfix - We fixed a possible crash: [#13](https://github.com/owncloud/client-desktop-vfs-win/pull/13)
+
+   We fixed a possible crash that could happen during the initialisation of the vfs plugin.
+
+   https://github.com/owncloud/client-desktop-vfs-win/pull/13
+
+* Enhancement - Reintroduce issue filtering: [#9000](https://github.com/owncloud/client/issues/9000)
+
+   We reintroduced a filtering option to the issue table. With the addition of a Filter button we
+   also made the existing filter by account feature more accessible.
+
+   https://github.com/owncloud/client/issues/9000
+   https://github.com/owncloud/client/pull/9023
+
+* Enhancement - Allow to remove broken sync folders: [#9099](https://github.com/owncloud/client/pull/9099)
+
+   In case a folder is no longer available it was not possible to remove the folder. We now made the
+   remove action available in that case.
+
+   https://github.com/owncloud/client/pull/9099
+
+* Enhancement - Also ignore local reapeating errors for a period of time: [#9208](https://github.com/owncloud/client/issues/9208)
+
+   If an error occurs on the server (a url is not reachable) we try a couple of times, then we ignore
+   that file for a period of time. We now do the same with erros that occure locally.
+
+   https://github.com/owncloud/client/issues/9208
+   https://github.com/owncloud/client/issues/9133
+
+* Enhancement - Remove the availability menu from the ui: [#9291](https://github.com/owncloud/client/pull/9291)
+
+   The availability options should be handled on a folder base and in the file browser.
+
+   https://github.com/owncloud/client/pull/9291
+
+* Enhancement - Add the syncroot to the search indexed with Windows VFS: [#12](https://github.com/owncloud/client-desktop-vfs-win/pull/12)
+
+   Microsoft recommends adding the syncroot to search indexer to improve the performance with
+   the file status icons.
+
+   https://github.com/owncloud/client-desktop-vfs-win/pull/12
+
+Changelog for ownCloud Desktop Client [2.9.2] (2021-11-24)
+=======================================
+The following sections list the changes in ownCloud Desktop Client 2.9.2 relevant to
+ownCloud admins and users.
+
+[2.9.2]: https://github.com/owncloud/client/compare/v2.9.1...v2.9.2
+
+Summary
+-------
+
+* Bugfix - Properly handle Windows log off: [#8979](https://github.com/owncloud/client/issues/8979)
+* Bugfix - Disable vfs option is ignored: [#9159](https://github.com/owncloud/client/issues/9159)
+* Bugfix - The client no longer idles after a minor url change: [#9202](https://github.com/owncloud/client/pull/9202)
+* Bugfix - Config migration on systems with a 2.4 and a 2.8 config: [#9224](https://github.com/owncloud/client/issues/9224)
+* Enhancement - Add branding option to disable icons in the file explorer: [#9167](https://github.com/owncloud/client/issues/9167)
+* Enhancement - Branding option to disable warning for multiple sync_journal.db's: [#9216](https://github.com/owncloud/client/pull/9216)
+
+Details
+-------
+
+* Bugfix - Properly handle Windows log off: [#8979](https://github.com/owncloud/client/issues/8979)
+
+   We now ensure that we receive the window messages dispatched by the system.
+
+   https://github.com/owncloud/client/issues/8979
+   https://github.com/owncloud/client/pull/9142
+   https://github.com/owncloud/client/pull/9220
+   https://github.com/owncloud/client/pull/9227
+
+* Bugfix - Disable vfs option is ignored: [#9159](https://github.com/owncloud/client/issues/9159)
+
+   We fixed a branding issue where vfs was used even when the parameter was set to disabled.
+
+   https://github.com/owncloud/client/issues/9159
+   https://github.com/owncloud/enterprise/issues/4820
+
+* Bugfix - The client no longer idles after a minor url change: [#9202](https://github.com/owncloud/client/pull/9202)
+
+   When the client detects a change of the url we ask the user to accept the change or if it was only
+   representational change (demo.com vs demo.com/) we directly accept the change. Due to a bug
+   the we aborted the sync only after we updated the url. This caused the client to idle for one
+   minute.
+
+   https://github.com/owncloud/client/pull/9202
+
+* Bugfix - Config migration on systems with a 2.4 and a 2.8 config: [#9224](https://github.com/owncloud/client/issues/9224)
+
+   We fixed a bug where the client migrated the old settings from 2.4 to 2.9 instead of the 2.8
+   settings. Only branded clients where affected by the issue.
+
+   https://github.com/owncloud/client/issues/9224
+   https://github.com/owncloud/client/pull/9226
+
+* Enhancement - Add branding option to disable icons in the file explorer: [#9167](https://github.com/owncloud/client/issues/9167)
+
+   We implemented a branding parameter to disable the display of icons in the file explorer
+   context menu, this only affects Windows and Linux.
+
+   https://github.com/owncloud/client/issues/9167
+
+* Enhancement - Branding option to disable warning for multiple sync_journal.db's: [#9216](https://github.com/owncloud/client/pull/9216)
+
+   We added a branding option that disables the `Multiple accounts are sharing the folder`
+   warning. In previous client versions a bug caused the creation of new sync journals, causing
+   false positives in the detection. While this can be handled by the individual user, companies
+   with multiple hundreds of users may opt to disable the warning.
+
+   https://github.com/owncloud/client/pull/9216
+
+Changelog for ownCloud Desktop Client [2.9.1] (2021-10-13)
+=======================================
+The following sections list the changes in ownCloud Desktop Client 2.9.1 relevant to
+ownCloud admins and users.
+
+[2.9.1]: https://github.com/owncloud/client/compare/v2.9.0...v2.9.1
+
+Summary
+-------
+
+* Bugfix - Mac multiple dialogs block all input: [#8421](https://github.com/owncloud/client/issues/8421)
+* Bugfix - Enforce rtl layout with rtl languages: [#8806](https://github.com/owncloud/client/issues/8806)
+* Bugfix - Broken url in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
+* Bugfix - Handle use of directory of another Windows VFS sync client: [#8994](https://github.com/owncloud/client/issues/8994)
+* Bugfix - Building libcloudprovider support fails: [#8996](https://github.com/owncloud/client/issues/8996)
+* Bugfix - Tables now display local time: [#9006](https://github.com/owncloud/client/issues/9006)
+* Bugfix - We fixed a crash when using the retry action on an issue: [#9013](https://github.com/owncloud/client/issues/9013)
+* Bugfix - Fix crash when closing the client: [#9014](https://github.com/owncloud/client/issues/9014)
+* Bugfix - Crash on missing or unreadable sync root: [#9016](https://github.com/owncloud/client/issues/9016)
+* Bugfix - A upgrade to 2.9 causes the usage of a new journal file: [#9019](https://github.com/owncloud/client/issues/9019)
+* Bugfix - Properly deployment of Qt translations Mac and Window: [#9022](https://github.com/owncloud/client/issues/9022)
+* Bugfix - The file status of suffix placeholders was displayed incorrectly: [#9026](https://github.com/owncloud/client/issues/9026)
+* Bugfix - When a folder is removed we leave a database behind: [#9057](https://github.com/owncloud/client/issues/9057)
+* Bugfix - Dehydrating placeholders failed if the file is read only: [#9093](https://github.com/owncloud/client/issues/9093)
+* Bugfix - Downgrades could trigger deletion of virtual files: [#9114](https://github.com/owncloud/client/issues/9114)
+* Enhancement - Display the error type in the issue protocol to allow sorting: [#9010](https://github.com/owncloud/client/pull/9010)
+
+Details
+-------
+
+* Bugfix - Mac multiple dialogs block all input: [#8421](https://github.com/owncloud/client/issues/8421)
+
+   We back ported a fix to a Qt bug which causes multiple dialogs on Mac to block all input.
+
+   https://github.com/owncloud/client/issues/8421
+   https://bugreports.qt.io/browse/QTBUG-91059
+   https://invent.kde.org/packaging/craft-blueprints-kde/-/commit/feca22a30f8d3a2122fd9b2097351fcb2da28543
+
+* Bugfix - Enforce rtl layout with rtl languages: [#8806](https://github.com/owncloud/client/issues/8806)
+
+   We fixed a bug where setting the language to a right to left language on mac did not change the
+   layout of the application.
+
+   https://github.com/owncloud/client/issues/8806
+   https://github.com/owncloud/client/pull/8981
+
+* Bugfix - Broken url in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
+
+   We fixed a string issue with branded builds resulting in invalid urls.
+
+   https://github.com/owncloud/client/issues/8920
+
+* Bugfix - Handle use of directory of another Windows VFS sync client: [#8994](https://github.com/owncloud/client/issues/8994)
+
+   We now better handle setup issues during the initialisation of virtual files support.
+   Especially the case that a user tries to use a directory managed by a competitor which until now
+   caused a crash.
+
+   https://github.com/owncloud/client/issues/8994
+
+* Bugfix - Building libcloudprovider support fails: [#8996](https://github.com/owncloud/client/issues/8996)
+
+   We fixed the libcloudprovider integration.
+
+   https://github.com/owncloud/client/issues/8996
+
+* Bugfix - Tables now display local time: [#9006](https://github.com/owncloud/client/issues/9006)
+
+   We fixed a bug where the sync tables where displaying utc time for some items.
+
+   https://github.com/owncloud/client/issues/9006
+
+* Bugfix - We fixed a crash when using the retry action on an issue: [#9013](https://github.com/owncloud/client/issues/9013)
+
+   Using the context menu action on a sync issue could cause a crash.
+
+   https://github.com/owncloud/client/issues/9013
+   https://github.com/owncloud/client/pull/9012
+
+* Bugfix - Fix crash when closing the client: [#9014](https://github.com/owncloud/client/issues/9014)
+
+   We fixed a crash where we crash when we closed the client during a sync.
+
+   https://github.com/owncloud/client/issues/9014
+
+* Bugfix - Crash on missing or unreadable sync root: [#9016](https://github.com/owncloud/client/issues/9016)
+
+   We fixed an issue where the client crashed after a user deleted the sync root or lost access to the
+   directory.
+
+   https://github.com/owncloud/client/issues/9016
+   https://github.com/owncloud/client/pull/9017
+   https://github.com/owncloud/client/pull/9065
+
+* Bugfix - A upgrade to 2.9 causes the usage of a new journal file: [#9019](https://github.com/owncloud/client/issues/9019)
+
+   We fixed a bug where the name of the sync journal was not properly saved to the settings. This
+   caused a bug when migration to 2.9, so a new a new sync journal was created.
+
+   This not only caused the loss of some selective sync settings, but also caused the display of the
+   following warning message:
+
+   ``` Multiple accounts are sharing the folder. This configuration is know to lead to dataloss
+   and is no longer supported. Please consider removing this folder from the account and adding it
+   again. ```
+
+   We also removed the account info infix from the sync db used with the cmd client.
+
+   https://github.com/owncloud/client/issues/9019
+   https://github.com/owncloud/client/pull/9028
+   https://github.com/owncloud/client/pull/9046
+   https://github.com/owncloud/client/pull/9054
+
+* Bugfix - Properly deployment of Qt translations Mac and Window: [#9022](https://github.com/owncloud/client/issues/9022)
+
+   We fixed a deployment bug which prevented the translation of some components to be loaded.
+
+   https://github.com/owncloud/client/issues/9022
+   https://invent.kde.org/packaging/craft/-/commit/77c114917826480f294d0432f147c9e9f7d19e21
+
+* Bugfix - The file status of suffix placeholders was displayed incorrectly: [#9026](https://github.com/owncloud/client/issues/9026)
+
+   We incorrectly reported that suffix files where ignored.
+
+   https://github.com/owncloud/client/issues/9026
+
+* Bugfix - When a folder is removed we leave a database behind: [#9057](https://github.com/owncloud/client/issues/9057)
+
+   We fixed a bug where we left an empty `sync_journal.db` behind, when we removed a
+   folder/account. As we use the presence of `sync_journal.db` to determine whether the folder
+   is used by a sync client this prevented using an old folder in a new setup.
+
+   https://github.com/owncloud/client/issues/9057
+
+* Bugfix - Dehydrating placeholders failed if the file is read only: [#9093](https://github.com/owncloud/client/issues/9093)
+
+   We fixed a bug where dehydrating a read only file failed without any apparent reason.
+
+   https://github.com/owncloud/client/issues/9093
+   https://gitea.owncloud.services/client/client-plugin-vfs-win/pulls/33
+
+* Bugfix - Downgrades could trigger deletion of virtual files: [#9114](https://github.com/owncloud/client/issues/9114)
+
+   We now prevent the downgrade of Windows VFS folders.
+
+   https://github.com/owncloud/client/issues/9114
+
+* Enhancement - Display the error type in the issue protocol to allow sorting: [#9010](https://github.com/owncloud/client/pull/9010)
+
+   We now display the error type in the not synced protocol and allow to sort by the error type.
+
+   https://github.com/owncloud/client/issues/9000
+   https://github.com/owncloud/client/pull/9010
+
+Changelog for ownCloud Desktop Client [2.9.0] (2021-09-08)
+=======================================
+The following sections list the changes in ownCloud Desktop Client 2.9.0 relevant to
+ownCloud admins and users.
+
+[2.9.0]: https://github.com/owncloud/client/compare/v2.8.2...v2.9.0
 
 Summary
 -------
@@ -14,15 +429,23 @@ Summary
 * Bugfix - SQLite wal file grows to several gigabyte: [#7646](https://github.com/owncloud/client/issues/7646)
 * Bugfix - Fix missing permission for newly created folder: [#8076](https://github.com/owncloud/client/pull/8076)
 * Bugfix - Don't recommend non default sync option: [#8317](https://github.com/owncloud/client/issues/8317)
+* Bugfix - Limit min window size to 2/3 available: [#8366](https://github.com/owncloud/client/issues/8366)
 * Bugfix - Set up default locale correctly: [#8367](https://github.com/owncloud/client/issues/8367)
+* Bugfix - Only show the settings if they are explicitly requested on start: [#8590](https://github.com/owncloud/client/issues/8590)
 * Bugfix - Ignore consecutive errors for a pereiode of time: [#8672](https://github.com/owncloud/client/issues/8672)
 * Bugfix - Properly print the sync events in .owncloudsync.log: [#8729](https://github.com/owncloud/client/issues/8729)
 * Bugfix - Correctly handle file path comparison on Windows: [#8732](https://github.com/owncloud/client/issues/8732)
 * Bugfix - Locked files are not correctly synced: [#8761](https://github.com/owncloud/client/issues/8761)
 * Bugfix - Prompt the user of the cmd client what to do if all files where removed: [#8804](https://github.com/owncloud/client/issues/8804)
 * Bugfix - Relaunching the client on macOS will show the settings dialog: [#8377](https://github.com/owncloud/client/issues/8377)
+* Bugfix - Fix config migrations from versions 2.8 to 2.9: [#8824](https://github.com/owncloud/client/issues/8824)
 * Bugfix - Always exclude .owncloud files: [#8836](https://github.com/owncloud/client/pull/8836)
 * Bugfix - Don't crash if a certain move is undone: [#8837](https://github.com/owncloud/client/issues/8837)
+* Bugfix - Prevent sync root sharing: [#8849](https://github.com/owncloud/client/issues/8849)
+* Bugfix - Removed support for client side certificates: [#8864](https://github.com/owncloud/client/pull/8864)
+* Bugfix - The `Re-open Browser` now always does what it says: [#8866](https://github.com/owncloud/client/pull/8866)
+* Bugfix - Start oauth/password prompt if password is wrong during start up: [#8901](https://github.com/owncloud/client/issues/8901)
+* Bugfix - Handle timeouts occurring during oauth: [#8940](https://github.com/owncloud/client/pull/8940)
 * Change - Don't ask the user to switch to http: [#8231](https://github.com/owncloud/client/issues/8231)
 * Change - Remove support for http redirects: [#8293](https://github.com/owncloud/client/pull/8293)
 * Change - We no longer try to locate an ownCloud install at /owncloud: [#8273](https://github.com/owncloud/client/issues/8273)
@@ -30,15 +453,18 @@ Summary
 * Change - Add support for dynamic client registration with OIDC: [#8350](https://github.com/owncloud/client/pull/8350/)
 * Change - Include full os version in the about dialog: [#8374](https://github.com/owncloud/client/pull/8374)
 * Change - We removed the support for async jobs using OC-JobStatus-Location: [#8398](https://github.com/owncloud/client/pull/8398)
+* Change - Add a branding option to skip the advanced setup page: [#8665](https://github.com/owncloud/client/issues/8665)
 * Enhancement - Prefer 127.0.0.1 as oauth redirect url: [#4542](https://github.com/owncloud/enterprise/issues/4542)
 * Enhancement - Display an icon in the Windows explorer context menu: [#4627](https://github.com/owncloud/client/issues/4627)
 * Enhancement - Show last sync date in tray menu: [#5644](https://github.com/owncloud/client/issues/5644)
+* Enhancement - Display the information state in case we encountered ignored errors: [#8858](https://github.com/owncloud/client/pull/8858)
 * Enhancement - Make crash report IDs easy to copy: [#25](https://github.com/dschmidt/libcrashreporter-qt/pull/25)
 * Enhancement - We reworked the tables: [#8158](https://github.com/owncloud/client/issues/8158)
 * Enhancement - Provide a socket api call to get the client icon and: [#8464](https://github.com/owncloud/client/issues/8464)
 * Enhancement - Add language picker to general settings: [#8466](https://github.com/owncloud/client/issues/8466)
 * Enhancement - Attach the last 20 log lines to a crash report: [#8467](https://github.com/owncloud/client/issues/8467)
 * Enhancement - Mention the local file name when a file name clash occurs: [#8609](https://github.com/owncloud/client/issues/8609)
+* Enhancement - Consider a remote poll interval coming with the server capabilities: [#5947](https://github.com/owncloud/client/issues/5947)
 * Enhancement - Improved handling of errors during local file updates: [#8787](https://github.com/owncloud/client/pull/8787)
 * Enhancement - Retry sync on `502 Bad Gateway`: [#8811](https://github.com/owncloud/client/issues/8811)
 
@@ -84,6 +510,13 @@ Details
 
    https://github.com/owncloud/client/issues/8317
 
+* Bugfix - Limit min window size to 2/3 available: [#8366](https://github.com/owncloud/client/issues/8366)
+
+   When scaling was used the window could become bigger than the screen. The size is now limited to
+   2/3 of the screen.
+
+   https://github.com/owncloud/client/issues/8366
+
 * Bugfix - Set up default locale correctly: [#8367](https://github.com/owncloud/client/issues/8367)
 
    Fixes the formatting in locale-dependent widgets, e.g., date pickers, like the one in the
@@ -93,6 +526,13 @@ Details
    https://github.com/owncloud/client/pull/8541
    https://github.com/owncloud/client/pull/8617
 
+* Bugfix - Only show the settings if they are explicitly requested on start: [#8590](https://github.com/owncloud/client/issues/8590)
+
+   We now only display the settings when the user requested it on start and not every time the
+   application is started a second time.
+
+   https://github.com/owncloud/client/issues/8590
+
 * Bugfix - Ignore consecutive errors for a pereiode of time: [#8672](https://github.com/owncloud/client/issues/8672)
 
    We fixed a bug where certain errors caused a sync run every 30 seconds
@@ -138,6 +578,17 @@ Details
    https://github.com/owncloud/client/issues/8377
    https://github.com/owncloud/client/pull/8812
 
+* Bugfix - Fix config migrations from versions 2.8 to 2.9: [#8824](https://github.com/owncloud/client/issues/8824)
+
+   Due to a value change of an internal Qt configuration variable, the configuration data could
+   not be migrated on many systems. We fixed this by implementing an additional migration path.
+
+   Furthermore, we removed the dependency on said value within the GUI, and use the values
+   explicitly from the theme to display the correct values on UI elements such as buttons.
+
+   https://github.com/owncloud/client/issues/8824
+   https://github.com/owncloud/client/pull/8860
+
 * Bugfix - Always exclude .owncloud files: [#8836](https://github.com/owncloud/client/pull/8836)
 
    Our Linux virtual files implementation is using the file name extension .owncloud those files
@@ -149,6 +600,43 @@ Details
 * Bugfix - Don't crash if a certain move is undone: [#8837](https://github.com/owncloud/client/issues/8837)
 
    https://github.com/owncloud/client/issues/8837
+   https://github.com/owncloud/client/pull/8863
+   https://github.com/owncloud/client/pull/8958
+
+* Bugfix - Prevent sync root sharing: [#8849](https://github.com/owncloud/client/issues/8849)
+
+   Due to legacy reasons it is possible to let two sync connections use the same directory. In
+   combination with virtual files this was leading to dataloss however.
+
+   https://github.com/owncloud/client/issues/8849
+   https://github.com/owncloud/client/issues/8512
+
+* Bugfix - Removed support for client side certificates: [#8864](https://github.com/owncloud/client/pull/8864)
+
+   Client side certificates where never officially supported and where untested in many
+   scenarios.
+
+   https://github.com/owncloud/client/pull/8864
+
+* Bugfix - The `Re-open Browser` now always does what it says: [#8866](https://github.com/owncloud/client/pull/8866)
+
+   Under certain conditions the previous authentication run might have failed and the button
+   became unresponsive, we now start a new authentication in that case.
+
+   https://github.com/owncloud/client/pull/8866
+
+* Bugfix - Start oauth/password prompt if password is wrong during start up: [#8901](https://github.com/owncloud/client/issues/8901)
+
+   If the oauth token was invalid during start up we didn't start the oauth process and the user
+   needed to manually log out in order to log in again.
+
+   https://github.com/owncloud/client/issues/8901
+
+* Bugfix - Handle timeouts occurring during oauth: [#8940](https://github.com/owncloud/client/pull/8940)
+
+   We now handle timeouts occurring during oauth.
+
+   https://github.com/owncloud/client/pull/8940
 
 * Change - Don't ask the user to switch to http: [#8231](https://github.com/owncloud/client/issues/8231)
 
@@ -198,6 +686,12 @@ Details
 
    https://github.com/owncloud/client/pull/8398
 
+* Change - Add a branding option to skip the advanced setup page: [#8665](https://github.com/owncloud/client/issues/8665)
+
+   If the option is enabled we will create a sync with the default values.
+
+   https://github.com/owncloud/client/issues/8665
+
 * Enhancement - Prefer 127.0.0.1 as oauth redirect url: [#4542](https://github.com/owncloud/enterprise/issues/4542)
 
    When using OpenID Connect we now always use http://127.0.0.1 as redirect url instead of
@@ -220,6 +714,21 @@ Details
    https://github.com/owncloud/client/issues/5644
    https://github.com/owncloud/client/pull/8547
 
+* Enhancement - Display the information state in case we encountered ignored errors: [#8858](https://github.com/owncloud/client/pull/8858)
+
+   If syncing a file fails multiple times we mark it as ignored to skip it for a certain amount of
+   time. If we have ignored files we are not in sync, we now don't display the green icon.
+
+   Additionally this change aligns the icon displayed in the system tray with the icon displayed
+   in the app.
+
+   Https://github.com/owncloud/client/issues/7715
+   https://github.com/owncloud/client/issues/7365
+   https://github.com/owncloud/client/issues/7200
+   https://github.com/owncloud/client/issues/5860
+
+   https://github.com/owncloud/client/pull/8858
+
 * Enhancement - Make crash report IDs easy to copy: [#25](https://github.com/dschmidt/libcrashreporter-qt/pull/25)
 
    Users can now click on crash report IDs to copy them to their personal clipboard. This way, they
@@ -274,6 +783,16 @@ Details
    https://github.com/owncloud/client/issues/8609
    https://github.com/owncloud/client/pull/8630
 
+* Enhancement - Consider a remote poll interval coming with the server capabilities: [#5947](https://github.com/owncloud/client/issues/5947)
+
+   This way, admins can configure the remote sync poll interval of clients through the
+   capabilities settings of the server. Note that the setting in the server capabilities needs to
+   be done in milliseconds. Default is 30 seconds.
+
+   https://github.com/owncloud/client/issues/5947
+   https://github.com/owncloud/client/issues/8780
+   https://github.com/owncloud/client/pull/8777
+
 * Enhancement - Improved handling of errors during local file updates: [#8787](https://github.com/owncloud/client/pull/8787)
 
    If a local metadata update fails we now provide the proper error in the ui. In case that the error
diff --git a/VERSION.cmake b/VERSION.cmake
index 5bb301c67..20bdefecc 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 "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )
diff --git a/changelog/unreleased/4896 b/changelog/2.10.0_2022-01-17/4896
index cc22d3570..cc22d3570 100644
--- a/changelog/unreleased/4896
+++ b/changelog/2.10.0_2022-01-17/4896
diff --git a/changelog/unreleased/8924 b/changelog/2.10.0_2022-01-17/8924
index f912bf333..f912bf333 100644
--- a/changelog/unreleased/8924
+++ b/changelog/2.10.0_2022-01-17/8924
diff --git a/changelog/unreleased/9000 b/changelog/2.10.0_2022-01-17/9000
index d7b2c903a..d7b2c903a 100644
--- a/changelog/unreleased/9000
+++ b/changelog/2.10.0_2022-01-17/9000
diff --git a/changelog/unreleased/9071 b/changelog/2.10.0_2022-01-17/9071
index 7f06ad929..7f06ad929 100644
--- a/changelog/unreleased/9071
+++ b/changelog/2.10.0_2022-01-17/9071
diff --git a/changelog/unreleased/9099 b/changelog/2.10.0_2022-01-17/9099
index afb0c7a11..afb0c7a11 100644
--- a/changelog/unreleased/9099
+++ b/changelog/2.10.0_2022-01-17/9099
diff --git a/changelog/unreleased/9149 b/changelog/2.10.0_2022-01-17/9149
index a31f84053..a31f84053 100644
--- a/changelog/unreleased/9149
+++ b/changelog/2.10.0_2022-01-17/9149
diff --git a/changelog/unreleased/9150 b/changelog/2.10.0_2022-01-17/9150
index 51fd69712..51fd69712 100644
--- a/changelog/unreleased/9150
+++ b/changelog/2.10.0_2022-01-17/9150
diff --git a/changelog/unreleased/9170 b/changelog/2.10.0_2022-01-17/9170
index baf7102ac..baf7102ac 100644
--- a/changelog/unreleased/9170
+++ b/changelog/2.10.0_2022-01-17/9170
diff --git a/changelog/unreleased/9194 b/changelog/2.10.0_2022-01-17/9194
index cdb04b1fe..cdb04b1fe 100644
--- a/changelog/unreleased/9194
+++ b/changelog/2.10.0_2022-01-17/9194
diff --git a/changelog/unreleased/9196 b/changelog/2.10.0_2022-01-17/9196
index 18503f1df..18503f1df 100644
--- a/changelog/unreleased/9196
+++ b/changelog/2.10.0_2022-01-17/9196
diff --git a/changelog/unreleased/9208 b/changelog/2.10.0_2022-01-17/9208
index 4a13803e7..4a13803e7 100644
--- a/changelog/unreleased/9208
+++ b/changelog/2.10.0_2022-01-17/9208
diff --git a/changelog/unreleased/9223 b/changelog/2.10.0_2022-01-17/9223
index e8411e96d..e8411e96d 100644
--- a/changelog/unreleased/9223
+++ b/changelog/2.10.0_2022-01-17/9223
diff --git a/changelog/unreleased/9241 b/changelog/2.10.0_2022-01-17/9241
index 84ae11c40..84ae11c40 100644
--- a/changelog/unreleased/9241
+++ b/changelog/2.10.0_2022-01-17/9241
diff --git a/changelog/unreleased/9257 b/changelog/2.10.0_2022-01-17/9257
index 56626eee6..56626eee6 100644
--- a/changelog/unreleased/9257
+++ b/changelog/2.10.0_2022-01-17/9257
diff --git a/changelog/unreleased/9266 b/changelog/2.10.0_2022-01-17/9266
index af3944746..af3944746 100644
--- a/changelog/unreleased/9266
+++ b/changelog/2.10.0_2022-01-17/9266
diff --git a/changelog/unreleased/9291 b/changelog/2.10.0_2022-01-17/9291
index e12db36ca..e12db36ca 100644
--- a/changelog/unreleased/9291
+++ b/changelog/2.10.0_2022-01-17/9291
diff --git a/changelog/unreleased/9293 b/changelog/2.10.0_2022-01-17/9293
index 515f55ba2..515f55ba2 100644
--- a/changelog/unreleased/9293
+++ b/changelog/2.10.0_2022-01-17/9293
diff --git a/changelog/unreleased/9341 b/changelog/2.10.0_2022-01-17/9341
index e9e16fc9e..e9e16fc9e 100644
--- a/changelog/unreleased/9341
+++ b/changelog/2.10.0_2022-01-17/9341
diff --git a/changelog/unreleased/9342 b/changelog/2.10.0_2022-01-17/9342
index 285c03aad..285c03aad 100644
--- a/changelog/unreleased/9342
+++ b/changelog/2.10.0_2022-01-17/9342
diff --git a/changelog/unreleased/client-desktop-vfs-win-12 b/changelog/2.10.0_2022-01-17/client-desktop-vfs-win-12
index aa7c3aae0..aa7c3aae0 100644
--- a/changelog/unreleased/client-desktop-vfs-win-12
+++ b/changelog/2.10.0_2022-01-17/client-desktop-vfs-win-12
diff --git a/changelog/unreleased/client-desktop-vfs-win-13 b/changelog/2.10.0_2022-01-17/client-desktop-vfs-win-13
index 8d17c2789..8d17c2789 100644
--- a/changelog/unreleased/client-desktop-vfs-win-13
+++ b/changelog/2.10.0_2022-01-17/client-desktop-vfs-win-13