ChangeLog: Re-format and re-order

diff --git a/ChangeLog b/ChangeLog
index 2d8489938a3948bb1ca943d4174c875b0f889ae5..d078fd9c7f40caa9417a437f752927e802be5d18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 ChangeLog
 =========
 
-version 2.4.0 (2017-0X-XX)
-* OAuth2 authentication support
-* Server URL: Update configuration in case of permanent redirection (#5972)
+version 2.4.0 (2017-1X-XX)
+* OAuth2 authentication support by opening external browser
+* Sync Issues: More functional error view including filters and conflicts (#5516)
 * Sharing: Add support for multiple public link shares (#5655)
 * Sharing: Add option to copy/email private links (#5627, #5023)
 * Sharing: Add option "show file listing" (#5837)
@@ -13,7 +13,8 @@ version 2.4.0 (2017-0X-XX)
 * Wizard: Never propose an existing folder for syncing (#5597)
 * Wizard: Don't show last page anymore, go to settings directly (#5726)
 * Wizard: Handle url-shortener redirects #5954
-* Settings Dialog: Display the user server avatar
+* Gui: Display the user server avatar
+* Server URL: Update configuration in case of permanent redirection (#5972)
 * Gui: Allow to add multiple sync folder connection of the same folder
 * Selective Sync: Open sub folder context menu (#5596)
 * Selective Sync: Skip excluded folders when reading db
@@ -22,53 +23,52 @@ version 2.4.0 (2017-0X-XX)
 * Excludes: Hardcode desktop.ini
 * Excludes: Allow escaping "#" (#6012)
 * Excludes: Use faster matching via QRegularExpression
-* Sync Issues: More functional error view including filters and conflicts (#5516)
 * Discovery: Increase the MAX_DEPTH and show deep folders as ignored
 * Discovery: General speed improvements
 * Downloads: Remove empty temporary if disk space full (#5746)
 * Downloads: Re-trigger folder discovery on 404
-* Quota:  PropagateUpload: Model of remote quota, avoid some uploads #5537
+* Quota:  PropagateUpload: Model of remote quota, avoid some uploads (#5537)
 * When creating explorer favorite use more specific windows functions (#5690)
 * Create favorite also in folder wizard (#455)
 * Windows: Use the application icon for the Windows 8 sidebar favorite (#2446)
-* macOS: Finder sidebar icon #296
-* AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
+* macOS: Finder sidebar icon (#296)
+* Overlay Icons: Consider also the "shared by me" as shared (#4788)
+* Overlay Icons: Fix different case paths not matching (#5257)
+* Windows Overlay Icons: Potential hang fixes
+* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
+* Http credentials: Fix behavior for bad password (#5989)
+* Credentials: Use per-account keychain entries (#5830)
+* AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819)
 * Added owncloudcmd bandwidth limit parameter (#5707)
 * AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
 * Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance
 * Sync: Introduce overall errors that are not tied to a file (#5746)
-* Sync: Better messaging for 507 Insufficient Storage #5537
-* Sync: Create conflicts by comparing the hash of files with identical mtime/size #5589
-* Sync: Blacklist: Don't let errors become warnings #5516
+* Sync: Better messaging for 507 Insufficient Storage (#5537)
+* Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589)
+* Sync: Blacklist: Don't let errors become warnings (#5516)
 * Sync: Check etag again after active sync (#4116)
+* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
 * Fix at least one memory leak
 * Documentation improvements
 * Logging improvements (with Qt logging categories), new --logdebug parameter
-* Harmonize source code style with clang-format
-* Switch over to Qt 5 function pointer signal/slot syntax
 * Crash fixes
 * Test improvements
 * Small UI layout fixes
 * Maintenance Mode: Detect maintenance mode (#4485)
-* Maintenance Mode: Add a 1 to 5 min reconnection delay #5872
-* HTTP: Send a unique X-Request-ID with each request #5853
+* Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
+* HTTP: Send a unique X-Request-ID with each request (#5853)
 * HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x)
-* owncloudcmd: Don't start if connection or auth fails #5692
-* Overlays: Consider also the "shared by me" as shared (#4788)
-* Overlays: Fix different case paths not matching (#5257)
-* Windows Overlays: Potential hang fixes
-* Switch 3rdparty/json usage to Qt5's QJson (#5710)
-* OpenSSL: Don't require directly, only via Qt
-* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS)
-* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
+* owncloudcmd: Don't start if connection or auth fails (#5692)
 * csync: Switch build from C to C++
 * csync: Refactor a lot to use common data structures to save memory and memory copying
 * csync: Switch some data structures to Qt data structures
 * csync: Switch to using upper layer SyncJournalDB
-* Http credentials: Fix behavior for bad password #5989
-* Credentials: Use per-account keychain entries #5830
-* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
+* Switch 3rdparty/json usage to Qt5's QJson (#5710)
+* OpenSSL: Don't require directly, only via Qt
+* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS)
 * Compilation: Remove Qt 4 code
+* Harmonize source code style with clang-format
+* Switch over to Qt 5 function pointer signal/slot syntax
 * Updater: Rudimentary support for beta channel
 
 version 2.3.3 (2017-08-29)