[Pkg-owncloud-commits] [owncloud-client] annotated tag v2.4.0-rc2 created (now b3eed03)

Sandro Knauß hefee at debian.org
Sat Dec 16 10:38:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

hefee pushed a change to annotated tag v2.4.0-rc2
in repository owncloud-client.

        at  b3eed03   (tag)
   tagging  61939d67e6c3f2487f83cee9ac9d53454d136359 (commit)
  replaces  v2.0.2-oem
 tagged by  Markus Goetz
        on  Sat Dec 16 10:12:45 2017 +0100

- Log -----------------------------------------------------------------
Create v2.4.0-rc2 tag
-----BEGIN PGP SIGNATURE-----

iQIcBAABAgAGBQJaNOONAAoJEEmMRevpTns3bdcQAKC31ArU7RyEXwsOj8V8IQoX
iVuvI6uWlN+DnS6Ga/KDFlPD99SfI4vZh+toxChMrlJDd1EAaeukSfkA8dSFBBVW
FcMjHh3XjneRvI93eHVkDvgzQuYyiqch6Qx4WBOTD28g6xd1h63dastWdp6naUaV
BGQu5ygzlS0a3Y9R4t/KL95sWHllHJP2t3JdZk21vsfrXF2DB8SSWWKwM4NDcg97
zXKyDAQqB45jfxgpicODF1qBUn66uacwBErXBc2B0mhAO1ejha/u8L182moyP6k9
SI/RAfxIoBae+4+bFRzf+IQD82fAc9jFncuI6kvBUdb4QeMWizY3WOw5RS3M6ST7
2M/dgezquPFqi/dB0vEvM1tR12TQiNl7FAdQRmShDHnsAqIA/23qNAH1ijP6oaQ0
rICDLcfbhUtbaiEOtPVotzkWSkohTL+jUipk998G4QMghy+aWnF/3qdWkCptDEGU
+Qx5MApXMIpDKcRwwdweagAmTnOL0856d+ERKF/NJfAuNYHU253/RSUHIAbfTMXd
dyQud2MnLECWePYsEghNWWQAqIGXK94VEcCsTbiC7aKGQuG6bXYYd8Fsp4+EoTmR
Rx/ToxUn9VYlwAahedw5EMPSKrBwGhmOQtFuVqyrAR9jjbz4IwwhYRal3ds3XHmA
cr8bKlf60OaGVXsPNhZO
=BYo5
-----END PGP SIGNATURE-----

Arthur Schiwon (1):
      show displaynames of users in share dialog instead of userid

Carla Schroder (29):
      1st batch of updates for 2.0
      Update installing.rst
      Update navigating.rst
      Update navigating.rst
      Merge pull request #3665 from owncloud/2-0updates
      update 3-dot menu
      some doc fixes & updates
      updates for 2.1 release
      more updates to 2.1 user manual
      corrections to 2.1 user manual
      clean up screenshot
      more image fixes
      added desktop sharing
      add note re mtime syncing
      doc updates for 2.1.1 release
      Add note that branded clients have custom windows registry key names
      fix formatting
      Merge pull request #4503 from owncloud/client-regkeys
      improve client build instructions
      corrections to client building instructions
      add OBS link for client building
      correct OBS url for client building
      Merge pull request #4509 from owncloud/build-client
      a bit of editing on new section
      Merge pull request #4704 from owncloud/doc_overlay_icons
      updates to 2.2 user manual
      update file manager screenshot
      fix win install instructions: build path and docker image name (#4901)
      add note about deleting .csync_journal.db for "CSync unknown error"

Carlos Damken (1):
      Ignoring "System Volume Information"

Christian Kamm (432):
      Propagation: Make 423 Locked a soft error #3387
      Sync: An initial diskspace check #2939
      Propagator: Download disk space checks #2939
      Propagation: Try another sync on 423 Locked #3387
      Checksums: Prepare 'supported checksums' capability #3735
      Fix the Qt4 build.
      Remove dead code
      Network errors: Use exception name, if message is empty #2718
      Merge branch '2.0'
      Tray: Change texts #3657
      FolderWatcher: Use csync exclude code #3805
      SelectiveSync: Apply excludes #3876
      SelectiveSync: Don't adjust removed path
      Exclusion: Fix confusion with relative and absolute paths
      ExcludedFiles: Add test
      AccountSettings: Show disabled 'Add Folder' tooltip on click #3645
      SelectiveSync: Show in-progress label #3524
      ETag: Allow parsing of weak tags #3946
      Progress estimation: Adjust low-transfer detection #3942
      Fix test compile
      Merge remote-tracking branch 'origin/2.0'
      Fix compile after pull request merge
      PropagateUpload: Fix double-emission of finished #3844
      Revert "In case of empty checksum type, emit validated."
      Checksums: Improvement in async computation and validation #3735
      SyncJournal: Add checksumHeader column to metadata table #3735
      Propagate: On download store checksum header in db #3735
      Propagate: Store computed checksums in db during upload #3735
      Checksum: Add env variables to disable #3735
      Checksum: Fix recomputation when forced in cfg file #3735
      Checksum: Disallow ADLER32, use Adler32 #3735
      csync tests: Remove unused function
      Checksum: Put checksum type into separate column #3735
      Checksum: Fixes after review
      Checksum: Don't lose it on metadata update #3735
      Propagator: Add blacklisting of disk space errors #2939
      --version also shows Qt version
      Hidden files: Consider .* hidden everywhere #4023
      Silence warning by removing extra semicolon
      Reflect read-only permissions in filesystem #3244
      Rename env variables to include unit #2939
      Settings: Show first account page on startup #4036
      Tray: Show settings dialog on click if it's not active
      CleanupPollsJobs: Preserve more journal data
      Checksums: Treat more carefully in db #4034
      SyncJournalFileRecord: Remove unused mode field
      Fix csync_exclude test
      Fix OwnSql test
      FolderMan: Fix infinite wait on pause #4093
      Recent Activity: Filter metadata updates #3963
      Recent Activity: Don't reset for no reason #3889
      Share dialog: Initialize expected expire date #4075
      Sharing: Fix crash with share deletion #4111
      Tray tooltip: Use aliasGui #4096
      ShareLink: Always initialize expire date #4075
      Add an experimental ProppatchJob #3235
      Checksums: Don't reupload if size and checksum are unchanged #3235
      csync_update: Remove disabled inode check
      Rename files
      Permissions: Keep more user permissions
      Checksums: Reuse the discovery checksum where possible
      ShareDialog: Completion uses MatchContains #4123
      Share dialog: Don't close on enter
      Blacklist: Clear on successful chunk upload #3934
      ShareDialog: Only link share if capabilities allow #4179
      Share dialog: Adjust layout #4119
      SelectiveSync: Show Apply/Cancel less
      Settings: Fix "Choose what to sync" #4187
      Re-apply ee69ab20211720d5d124bf58f35be5b69f84971b
      Share dialog: Work around painting bug #4189
      Blacklist: Firewall errors are silenced for up to 1h only #4071
      Tests: Add a perl test for eml checksums #3235
      Blacklist: Treat all 403s the same #4071
      Settings dialog: Fix crash when deleting account #4202
      Doc: Add checksum overview
      UI: Sign in/out -> Log in/out #4249
      Share UI: Respect enfore-expire #4235
      Share UI: Hide 'can share' if capability missing #4231
      Share UI: Hide 'allow editing' for files #4211
      AccountWizard: Don't crash when sync is running #4221
      Creds: Forget password on explicit sign-out #4241
      Force account wizard when last account is deleted #4266
      Wizard: Find user:pw even if redirected #4265
      Activity: Improve formatting of copied data #3498
      Activity tab doesn't vanish with too many accounts #4188
      SocketAPI: Fix file error cache #3944
      SocketAPI: Ensure messages are consistent #3944
      SocketAPI: Don't use ERROR for SoftErrors #3944
      Merge remote-tracking branch 'origin/2.1'
      Silence warning about zorder in .ui file.
      Log: Remove scary messages :)
      FolderWatcher: Remove IN_DONT_FOLLOW #3475
      Share UI: Allow typing in a sharee
      User Sharing: Match user names and case insensitive #4269
      Propagator: Deal with files becoming directories #4302
      Propagator: Deal with directories becoming files #4302
      Windows: Fix deleting and replacing of read-only files #4308
      Fix crash when deleting account while sync is running #4337
      Propagator: Remove warning when moving out of deleted folder
      Propagation: Fix dir <-> file changes propagating to server #4302
      Win: Fix filesystem detection for exFAT workaround #2701
      Share dialog: Remove unintended spinner when password required
      Share dialog: Error reporting with password policy #4209
      AccountSettings: Auto-expand only single folders #4283
      Sharing: Allow only one share dialog per path #3184
      Update: Check checksum for renamed files #2983
      Sharing: Fix resharing items with limited permissions #4357 #4358
      Share dialog: More error handling with password policy #4209
      Don't make files read-only when server is too old #4450
      Add 'pause all' tray menu entry #3829
      AccountState: Allow storing state in settings
      Improve folder pausing API
      Add warnings for old server versions #4523
      Checksums: Content checksums for all uploads #4375
      Checksums: Compute content checksum on download #4375
      Don't use QVector::removeOne, added in Qt 5.4
      Downloads: Preserve group ownership #4330
      Settings: Hide update info if skipUpdateCheck #4397
      SqlQuery: Write NULL when intended #4548
      SqlQuery: Write NULL when intended #4548
      Doc: low disk space #4443
      Propfind: Treat broken XML response as failure #4575
      Handle server timezone data correctly #4521
      Ignores: expand escapes #4568
      Fix compile with strict C flags
      Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
      Quota: Change quota path if single folder #4460
      Fix wizardSelectiveSyncDefaultNothing #4581
      Account UI: Fix log out button text #4578
      Adjust size description strings #3403
      Add utility function for shorter time duration strings #3403
      Update QTreeView tooltips as they change #3403
      Folder info layout adjustments #3403
      Tooltip updater: Fix compile with Qt4
      Theme: Enable link sharing by default
      SyncFileStatusTracker: Fix compilation with older Qt
      Fix invalid read on account removal
      Graceful termination of folderwatcher_win #4620
      Don't call reset() on a query after close() #4662
      Fix hidden file handling #4655
      Explicitly depend on Qt5Test.
      Fix unit test build
      Disable unavailable sharing permissions #4383
      ShareDialog: Tell a user early if resharing is impossible #4679
      Fix typo
      Activity tab visibility fixes #4651
      Add server capabilities for checksums #4638
      Share link: Consistent order of options owncloud/core#24122
      Share link: Consistent order of options owncloud/core#24122
      Overlay icons: Fix duplicate icons in nautilus #3249
      Overlay icons: Fix invalidation with nautilus #3249
      Checksums: Use the first supported type if nothing is preferred
      Remote folder selection: improve path typing #4745 #4746
      Overlay icons: Track touched files #4730
      Protocol: Make timestamp column width fit the text #4721
      Selective sync: Sort folders in FolderStatusModel #4612
      FolderWizard: Sort remote folders #4612
      Fix perl tests #4722
      Checksums: Skip uploads of .eml files only #4754
      timeAgo test: Fix for qt4, clean up
      Protocol: Increase width of timestamp column #4721
      Ignores: expand escapes #4568
      Fix compile with strict C flags
      Activity: When a new notification arrives, switch to that tab #4805
      Checksums: Compute content checksum on download #4375
      Merge remote-tracking branch 'origin/2.2'
      Fix compile warnings in tests
      Fix Qt4 build
      Add error message for trailing spaces on Windows #4878
      Log: Write the sync log during propagation #3108
      Log: Include start of propagation and lap duration
      owncloudcmd: Fix --exclude regression
      Merge remote-tracking branch 'origin/2.2'
      Fix Qt4 build
      Tray: Add minimal mode as workaround and testing tool #4985 #4990
      Set discovery thread priority to low #5017
      Add 'open in browser' to account menu #4824
      owncloudcmd: Make source_dir absolute #5035
      Revert "Add 'open in browser' to account menu #4824"
      Excludes: Fix a Windows specific bug #5039
      ShareLink: Ensure the password line edit is enabled #5117
      Shibboleth: Fix detection in account wizard #5138
      Account wizard: Enable back button consistently #5107
      Recall: Copy instead of move recalled file #5150
      Switch target version of this branch to 2.2.4
      ShareLink: Ensure the password line edit is enabled #5117
      Recall: Copy instead of move recalled file #5150
      Set discovery thread priority to low #5017
      Improvements to file recall
      Add log messages for LockWatcher use #5190
      Fix Windows build with WITH_UNIT_TESTING
      Warning if mailto url fails #5142
      Merge remote-tracking branch 'origin/2.2'
      ShareDialog: Remove context help button
      Package: Fix nautilus plugin name collision when branded
      Doc: Remove mention of "F5 to reset database" #5130
      Tray: Fix crash on startup for non-OSX oses
      Remove stale commented code
      Force a remote discovery when upgrading to this version #5242
      Progress: Reset lastCompletedItem #5256
      FolderMan: Document and clean up folder scheduling
      FolderMan: Clean up API
      License: Adjust license of GPLv2 source files to GPLv2+
      Remove unused functions
      Account: Remove wasMigrated/setMigrated
      Move concatUrl and settingsWithGroup to Utility
      Account: Rearrange for readability
      Terminate sync when pausing from context menu #5290
      Network: Add "Accept" header for some firewalls #5298
      Test: Don't fail when DST change is near #5284
      Sort folder list alphabetically #5299
      FolderStatusModel: Minor cleanups.
      Conflicts: Use the local mtime for the conflict file name #5273
      Tray: Add a 'New account...' action if no account is configured #5307
      Always send a progress message at the end of a sync #5290
      Enable clicking on 'not synced' items #5306
      FolderMan: Never schedule paused folders #5290
      Merge branch 'master' into dbjournal_per_account
      Rename sync journal to ._sync_xxx.db.
      Always migrate .csync_journal to ._sync_xxx
      Split folders configuration locations for backwards compatibility
      Don't wipe each journal on each start
      Bugfixes for sync journal name generation and usage
      Account: Rename user() to davUser()
      Fix perl tests for sync journal db name
      AccountSettings: Add a "Force sync now" context menu option
      Ensure the 'Sync paused' state is used after pausing #5290
      Fix compilation with Qt < 5.1
      FolderWizard: pass AccountPtr by const&
      Sync now: Disable on disconnect, rename while running #2158
      Don't wipe db if check fails while disk space is low #5357
      Move qDeclareMetatype from Folder to SyncEngine
      Increase initial bandwidth estimates #4428 #5390
      Wizard: Detach saved account from wizard
      Reschedule a folder regularly with some delay for some errors
      Only create a FolderWatcher if the path exists
      Fixup broken authType on load #5408
      Sql: Allow prepare fail for PRAGMA quick_check #5357
      Fix compile of tests
      Wizard: Let the user know if url is invalid #5398
      Doc: Improve example #5422
      Wizard: Don't accidentally pre-fill url field #5412
      Account: Fix displayName() #5413
      ownsql: qFatal on prepare errors #5357
      Log the auth type being used for accounts
      Doc: Add forceSyncInterval and timeout config file flags
      Selective sync: Adjust widget common to folder/account wizards
      wizardSelectiveSyncDefaultNothing applies to folder wizard #4581
      PropagatorJob: Access propagator through function #5453
      PropagatorJob: Remove unneccessary pointer #5453
      Folder: Remove unused variable
      Folders: Adjust ui when account is disconnected #5477
      Shib: Use different keychain entry per account #5469
      Performance: reserve() _remotePerm #5496
      Double check usage of asserts #5429
      CMake: Don't force-enable asserts #5429
      Doc: For conflicts, the local file is renamed #5521
      Recent Changes: Fix duplicates #5256
      Revert "Don't blacklist 507 Insufficent Storage #5346 (#5424)"
      Wizard: Handle PROPFIND redirects #5553
      AbstractNetworkJob: Improve redirect handling #5555
      Remove unreachable code #5582
      Blacklist: Escalate repeated SoftError to NormalError #5500
      Windows/NTFS: Do not attempt to upload inaccessible files #5544
      Add more versions to --version #5592
      Account server version: Helper to create versions
      HttpCreds: Update app passwords url #5605
      About: Show the runtime versions of Qt and OpenSSL #5592
      Wizard: Remove unused oldLocalFolder property
      Wizards: Never propose an existing folder for syncing #5597
      ShareDialog: Make "can edit" partially checked sometimes #5642
      dynamic chunking: cleanup, fixes, improvements
      Merge branch 'dynamic_chunking'
      Improve http error messages; cleanup
      owncloudcmd docs: Mention required sync-exclude.lst #5679
      ShareDialog: Fix thumbnail size #5654
      ShareDialog: Margin and spacing refinements #5627
      ShareDialog: Hide the detailed permissions if there is only one #5655
      Transfers: Show a decimal for single digit MB rates #4428
      Doc: Update to new sync journal db name #5662
      ShareDialog: Reenable user input textedit on error #5694
      AccountSettings: Easier access to selected folder alias
      AccountSettings: Sync with clean discovery on Ctrl-F6 #5666
      ShareDialog: Use a tab widget #5655
      Rename ShareWidget to ShareUserLine
      ShareDialog: Add support for multiple public link shares #5655
      ShareDialog: Review fixes
      Sharing multiple public links: Depend on new capability
      Merge remote-tracking branch 'origin/2.3'
      SqlDatabase: Ask freeSpace for directory, fix for Windows
      Share dialog: Add option to copy/email direct links #5627
      SSL error handling: Remove unnecessary confusing code
      Downloads: Remove empty temporary if disk space full #5746
      Sharing: Switch from QtJson to Qt5's QJson #5710
      Switch JsonApiJob to Qt5's QJson #5710
      Port PollJob responses to Qt5's QJson #5710
      Remove 3rdparty qjson #5710
      Remove stray debug output
      Detect maintenance mode #4485
      Wizard: Skip result page with acceptance instead of closing #5764
      Selective sync: Skip excluded folders when reading db
      Add .clang-format style
      Reformatting: Adjust trailing comments
      Reformatting: Reformat some lines that would become really long
      Apply clang-format
      Reformatting: Add .git-blame-ignore-revs
      Merge remote-tracking branch 'origin/2.3'
      mirall.desktop.in: Remove superfluous lines #5767
      Merge branch '2.3'
      Settings: Ensure the 'about' label isn't cut off #5760
      Sharing: Show warning that link shares are public #5785 #5747
      Account: forget credentials on delete #5752
      Credentials: Simplify credential flow #5728
      Share dialog: Hide the icon when unused
      Sharing dialog: Ensure error labels are expanding #5774
      Share link: Fix parsing integer ids #5777
      Share Dialog: Remove unused hline
      Share link: Fix disabled API/sharing #5778
      Share dialog: Use default icon if available #5781
      Sharing: Disable 'set password' button when password is empty #5788
      Download: Retrigger folder discovery on 404
      Fix maintenance mode detection #5755
      Add extra logging for SQLITE_CANTOPEN errors #5633
      Add extra logging for SQLITE_CANTOPEN errors #5633
      Merge branch '2.3'
      OAuth: Fix a typo in the success message
      SyncEngineTest: Fix date locale related bug
      SyncEngineTest: Send 'checksums' in FakePropfind
      SyncEngineTest: Add network override
      Compare the hash of files with identical mtime/size #5589
      Journal: Don't use a ._ path if it won't work #5633
      Ignore ui: Add the sync journal patterns #5844
      Merge remote-tracking branch 'origin/2.3'
      csync tests: Fix for new owncloudcmd return codes
      SyncEngine: Add unittest for SyncFileItem properties #5855
      csync tests: remove stray 'print'
      SyncEngineTest: Fix test reliability
      Blacklist: Don't let errors become warnings #5516
      AccountState: Add a 1-5min reconnection delay #5872
      Fix crash on account deletion
      Introduce private link sharing #5023
      SocketAPI: Change strings to a consistent _MENU_TITLE postfix
      shell integrations: Change share menu title to "Share..."
      Link shares: Add "show file listing" option #5837
      Link share: Remove direct download if unavailable #5837
      Account/Credentials: Have identical lifetimes
      FolderMan: Add missing folderListChanged emits
      IssuesTab: Hide filters if they wouldn't be useful
      SyncEngine: Introduce overall errors that are not tied to a file #5746
      ProgressInfo: Carry a sync status
      PropagateUpload: Put upload error handling in one function
      PropagateUpload: Better messaging for 507 #5537
      Add ElidedLabel
      IssuesWidget: Hide folder column when possible
      IssuesWidget: Add button to retry 507 errors #5537
      Merge remote-tracking branch 'origin/2.3'
      SyncEngineTest: _size now correct for uploads #5855
      IssuesWidget: Fix insertion of sync errors before item errors
      Conflicts: Detect and show in issues tab
      AccountSettings: Draw a box to indicate pending conflicts
      Account: Send a X-Request-ID header #5853
      Ensure qsrand is called
      Add minor unittest for numeric id extraction #5933
      Fix compile errors
      Http credentials: Fix behavior for bad password #5989
      Use DetermineAuthTypeJob in HttpCredentials
      Update server url in case of permanent redirection #5972
      Folder: Check etag again after active sync #4116
      Journal: Fall back to DELETE on IO error #5723
      Excludes: Allow escaping # #6012
      Make DetailError different from BlacklistedError
      SyncOptions/Propagator: Parallelism as an option
      PropagateUpload: Model of remote quota, avoid some uploads #5537
      OAuth: Use redirectable jobs for oauth token management
      OAuth: Pass client auth in header instead of url
      OAuth: Don't use implicit POST bodies
      Journal: Second attempt at journal mode fallback #5723
      Credentials: Use per-account keychain entries #5830
      HttpCreds: Remove migration code from 1.7
      Wizard: Handle url-shortener redirects #5954
      Reduce timeout for some admin jobs
      AbstractNetworkJob: Allow relative redirect
      Checksums: Clearer behavior and added testing
      Private links: Retrieve link through propfind property #6020
      Conflicts: Upload them files if env variable says so
      Fix compile with bad strrchr signature
      SyncEngine: Adjust free space messaging
      Move the --version output text to Theme #5957
      Packaging: Change directory for docs #5957
      Packaging: Make check for theme.qrc more specific #5957
      Packaging: Adjust APPNAME handling #5957
      Packaging: Add options for fine-grained builds #5957
      Excludes: optimize csync_is_windows_reserved_word
      Excludes: Fix bug with escapes in the regex, add tests
      t9.pl: Make more reliable
      Rename detection: File size must be equal
      Context menu: More detailed status messages
      PropagateDownload: Read Content-md5 header #6088
      Doc: Update FAQ entry on deeply nested directories #1067
      Checksums: Improve logging and add global disable #5017
      HttpCreds: Fix retry after wrong password #5989
      UploadNG: Avoid div-by-zero for super fast uploads
      TestUtils: Invalidate etags on PUT or chunk-MOVE
      Test case for #5949
      Propagator: Avoid duplicate async abort
      Abort: Fix crash with early aborts
      Activity: Allow sorting of issues and protocol #6086
      Sync: Add capability for invalid filename regexes #6092
      Wizard: Resolve url/ redirects only if url/status.php not found
      Reconcile: Rename handling fixes: duplicate file ids
      Wizard: Don't report confusing error message #6116
      Credentials: Namespace windows cred keys #6125
      Journal: Don't crash if the db file is readonly #6050
      HttpCreds: Don't create empty client cert keychain entries #5752
      Journal: Fix low-disk space errors
      DetermineAuthType: Adjustments for tight firewalls #6135
      Discovery: Treat files starting with '.' as hidden #6145
      Sql: db close() failing isn't fatal
      DetermineAuth: Remove concept of Unknown #6148
      Private links: Retrieve numeric file id property #6146
      Private links: Account for overwritehost #6146
      PropagateDownload: Fix GET with redirects #6159
      Share link: Add tooltip to delete button #6163
      Wizard: Add explanation text when server error is shown #6157
      Share links: Confirm deletion explicitly #6163
      PropagateDownload: Adjustments to skipping downloads #6153
      Tray: Fix 'Open folder' action creation
      Link share: Move 'delete' button to the bottom #6163
      Clear csync rename mappings after reconcile
      Reconcile: Rename maps are consistent with update phase #6212
      Journal: 64bit inodes, fix storing uint64s generally
      Disable stack protection for mingw win32 builds in 2.4

Daniel Molkentin (105):
      Merge pull request #3601 from individual-it/master
      Merge pull request #3781 from phil-davis/FSC
      Merge pull request #3789 from hh-lohmann/Terminology
      Merge pull request #3892 from RealRancor/fix_faq
      Merge pull request #3982 from owncloud/20-update
      Merge remote-tracking branch 'origin/2.0'
      Revert "Settings dialog: remove the close button #3713"
      State application name in update notification
      Merge remote-tracking branch 'origin/2.0'
      Fix Qt4 build
      Fix OS X compilation: use mode_t instead of __mode_t
      Forward-declare QModelIndex. Fixes Qt4 builds.
      Add the set of currently used patches
      Documentation: Fix PDF logo, version number
      Merge remote-tracking branch 'origin/2.0'
      Remove spacer that would constrain a vertical resize
      Add more Qt patches
      Ensure patches apply cleanly, drop patch 14
      Qt patches: Tweak more for Qt 5.4.0
      Qt: Add Windows-specific patches OBS, also a QNAM fix
      Merge remote-tracking branch 'origin/2.1'
      CMake: fix CMake 2.6 compatibility
      CMake: Fix typo
      Merge pull request #4224 from owncloud/21update
      Use user-readable short folder path in the context menu
      Merge pull request #4243 from owncloud/more21update
      Editorial changes to ChangeLog
      Merge pull request #4247 from owncloud/desktopshare
      FF doc subrepo to adjust to new .org theming
      Ensure Qt translator does always get loaded.
      Enable HiDpi scaling with Qt 5.6
      Remove bearer plugins
      Work around layouting issue for RTL languages
      Translation cleanups
      Update German translation
      Document all owncloudcmd switches in man page/doc
      Add mac system tray fix as deployed on the build machine
      Merge remote-tracking branch 'origin/2.1'
      Move ocdoc to current documentation master to catch up with new design
      Add Dockerfile that allows cross compiling the client
      Bring build documentation up to date, use docker for Win32 xbuild
      Doc: Instruct to use sha256 for Authenticode signing
      update Changelog
      Update ChangeLog
      ChangeLog: Set release date
      Merge remote-tracking branch 'origin/2.1'
      Merge pull request #4461 from owncloud/bump-year-to-2016
      Win32: More complete resource specification
      Add file description, copyright to win32 VERSIONINFO struct
      Add comment, transliterate copyright symbol
      Use correct values for items in version.rc
      Merge pull request #4488 from owncloud/21-updates
      Show full path in warning message boxes before folder removal
      Merge pull request #4582 from owncloud/nsis_uninstall_test
      Wizard: Implement alternative forms of inquiring about the userID
      Implement enforcing a static URL postfix.
      Merge pull request #4580 from owncloud/implement_ep_1136
      No Q_NULLPTR in Qt 4.8
      Scale correctly with HiDPI displays on Linux with Qt 5.6
      Remove deleted icons from resource file
      Update binary subdir
      Make postfixlineedit more userfriendly, rename email id string to "Email".
      document Theme::wizardUrlHint()
      No need for WebKitWidgets in libsync anymore
      Update doc and Dockerfile for 2.2 builds
      Use QTokenizer to properly parse netrc
      Merge pull request #4709 from owncloud/fix_4691
      Fix search & replace error in Dockerfile
      Merge pull request #4715 from owncloud/translate-desktop-ini
      Disambiguate socket API pathes on Windows with user name
      Revert "Disambiguate socket API pathes on Windows with user name"
      Merge pull request #4756 from owncloud/revert-4738-fix_3411
      Re-Apply: Disambiguate socket API pathes on Windows with user name
      Windows Shell Integration: Unify path lookups
      Update binary sub module
      Windows Shell Integration: Fix another spot where the pipe path was constructed manually
      Update binary submodule
      Merge pull request #4821 from owncloud/notification_doc
      Merge pull request #4825 from owncloud/22-user-manual
      2.2.0 final
      Bump to 2.2.1
      Fix pot. mem leak found by coverity (CID 12900)
      Fix pot. mem leak found by coverity (CID 96004)
      Travis coverity: Enforce Ubuntu 14.04 env, fix repo
      Merge remote-tracking branch 'origin/2.2'
      Undo regression caused by 727e73d
      Merge pull request #4913 from owncloud/normalize_name_in_filestatus
      Merge pull request #4916 from mwleeds/patch-1
      Don't try to determine pixel ratio with Qt < 5.6.0
      Merge pull request #4922 from owncloud/fix_4840
      Merge pull request #4923 from RobinGeuze/2.2
      Remove stray file
      Fix memleak in updater
      Merge pull request #4935 from owncloud/fix_updater_memleak
      Merge pull request #4938 from owncloud/fix_4840
      Merge pull request #4939 from owncloud/osx_filewatcher_fix
      This branch is headed towards 2.2.3 now
      Only accept notification API Capability if endpoint is OCS-enabled
      Merge pull request #5034 from owncloud/fix-5033
      Update owner to be ownCloud GmbH
      More GmbH -> Inc Copyright header fixes
      Fix module loading
      Ensure OpenSSL config file is only read from app dir
      Always follow redirects in network jobs (#4905)
      Update owner to be ownCloud GmbH

Dominik Schmidt (4):
      Disable Qt4 CI
      Fix build on Debian 7 (CMake pre 2.8.12)
      Remove obsolete FindQtKeychain for Qt4
      Set CMAKE_INSTALL_RPATH as RPATH for installed executables

Felix Tiede (3):
      Extend OEM configurability to dolphin desktop file.
      Fix file installation source path.
      Generate .desktop file with OEM name directly.

Frederik Juul Christiani (4):
      Initialize stop variable.
      shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.
      Initialize stop variable.
      shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.

Gilbert Röhrbein (3):
      nautilus integration: "share" extension for syncing folders
      nautilus integration: use os.path.join, os.sep and tempfile.gettempdir instead of string concats
      nautilus integration: refactored _connectToSocketServer, removed superfluous check

Giovanni Capuano (1):
      Fix link to the binary packages in README.md

Grigorii Horos (1):
      Dolphin integration: use system icons for labels in KDE

Hefee (6):
      Don't install tests and cmocka lib.
      fix typo occured->occurred
      Merge branch '2.1'
      For tests we do not need a xserver running.
      Use OWNCLOUD_BIN_DIR directly in C++ code.
      make doc-man working again.

Helmut K. C. Tessarek (1):
      remove qt4 code

Individual IT Services (2):
      checking if file or folder is to be shared to fix issue #3556
      fix unicode issue #3753

James Botting (3):
      Add additional configuration option to toggle display of delete prompt
      Alter sync engine to check new setting before displaying prompt
      Remove option from GUI, leaving config option only.

Jenkins for ownCloud (678):
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex

Joas Schilling (1):
      Make returncode 0 for --version and --help

Jocelyn Turcotte (212):
      Add a sign in button in the settings window
      Remove the _readPwdFromDeprecatedPlace codepath
      Show a notification instead of a login window on startup #3350
      Get rid of ShibbolethRefresher
      Simplify the authentication code paths #3350
      Separate the credential dialog from their fetch #3350
      Remove *Credentials::_fetchJobInProgress
      Fix a missing sync-exclude.lst file not failing the sync
      Fix OK statuses not being broadcasted during a sync #3944
      Rename SyncFileStatus::STATUS_SYNC to STATUS_UPTODATE
      Bring back the red box for errors #3796
      Don't show parent folders in the error list #3796
      Keep only active entries in the Not Synced list #3171
      Only clean the Not Synced list for the current account #3171
      Fix the rendering of the red error box text
      Windows: Fix HiDPI #3414
      Windows: Update the overlay icon graphics #3105
      Fix the folder option button click
      Windows: Fix the progress text being cut but a few pixels
      Windows shell: Remove unneeded Winsock code #4356
      OS X shell: Don't allow sharing sync roots #3505
      shell: Update binaries to fix the Directory Opus warning
      Bring back the automatic authentication popups
      Fix gen_sym_files.py trying to process non-macho files
      Do a codesign --verify before running spctl
      OS X: Make sure Qt frameworks have the right structure
      OS X: Fix macdeployqt not to embed symlinks when ran multiple times
      OS X: The --strict option isn't supported on the build machine
      Fix the crash reporter not launching
      OS X: Fix the file system watcher ignoring unicode paths #4424
      Merge pull request #4508 from owncloud/fix-crash
      Fix TestXmlParse::testParser1
      Remove superfluous error checking from csync_create and csync_init
      Move the csync_context creation in SyncEngine
      Fix a crash when syncing
      Add comment and cleanup the csync exclude list code
      Move the Logger reference back into src/gui
      Merge pull request #4584 from lultimouomo/fix-destruction-order
      [Win-shellex] Make sure to unregister obsolete CLSIDs #4595
      Make the AccountState a construction argument of the Folder
      Move the SyncEngine construction to the Folder constructor
      Remove the mutex from ExcludedFiles
      Remove OwnCloud6 specific sharing code
      Remove the tainted folder logic
      Remove SocketApi::dbFileRecord_capi in favor of JournalDB::getFileRecord
      Remove null-checks for FolderMan::_socketApi
      Move the SocketApi business logic to a libsync SyncFileStatusTracker class
      Connect the SocketApi directly to the SyncFileStatusTracker
      Don's use SyncFileStatus for Folder::createGuiLog
      Refactor the overlay icon logic to show errors as a warning for parent folders #3634
      Use a std::map for SyncFileStatusTracker problems
      Cleanup after the SyncFileStatusTracker change
      Move the SyncFileStatusTracker directory slash suffix logic in a method
      Fix sibbling directories showing up as warning
      Fix the SocketApi status of CSYNC_FILE_SILENTLY_EXCLUDED files
      Fix the build on Windows
      Simplify the build of auto tests
      Hide environment variables when running the FinderSync icns script
      Merge pull request #4625 from owncloud/trivialFixes
      Overlay icon fixes (#4765)
      Revert "Overlay icon fixes (#4765)"
      Fix the sync status push for parent directories #4682
      Fix the root item sync status #4682
      Simplify the root status logic
      Avoid a SyncFileStatusTracker private overload with the same name
      [osx] Fix missing overlay icons on client startup
      Merge branch 'overlayIconFixes' into 2.2 (#4765)
      [shell/windows] Fix the windows status push not working (#4784)
      Fix assert on restore after propagation (#4823)
      Account: Use smart pointers to hold its credentials and QNAM objects
      Attempt to fix the Account::slotHandleSslErrors crash
      Merge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash
      SocketAPI: Move the normalization closer to the data entrance (#4972)
      SocketAPI: Push new status of dirty files regardless when not synced (#4970)
      Fix a crash on if shutting down during propagation
      Prevent the sync protocol widget from over-using memory
      Delete the ComputeChecksum object when the job is finished
      Reduce the memory usage of the StopWatch during propagation
      Fix the Qt4 build
      shell_integration/windows: Add a manually-increased build number
      shell_integration/windows: Set VS output directory in the binary submodule
      binaries: Update to build 42 owncloud/client#4977
      Fix a deadlock when shutting down during discovery (#4993)
      Fix a QAction leak (#5008)
      Merge pull request #5007 from owncloud/rebuildWinShellIntegration
      shell/windows: Add missing Win32 configuration changes
      shell/windows: Build 43, add missing 32 bit binaries
      Revert "Fix a deadlock when shutting down during discovery" (#5100)
      tx.pl: Fix each put_to_dir taking 10 seconds
      Add TestSyncEngine and TestSyncFileStatusTracker auto tests
      Make sure that we invalidate parents on blacklisted items
      csync: Use an explicit instruction for should_update_metadata
      [overlays] Fix folders appearing as OK even though children are still syncing #4797
      Merge pull request #5122 from jturcotte/syncfilestatustrackerTests
      Fix the Qt4 unit testing build
      Fix the MSVC build
      Fix unit testing build warning on Linux
      Merge pull request #5182 from jturcotte/msvcBuild
      Rebase Qt patches on 5.6 #3449
      Don't try to deploy the mng image format plugin on macOS
      Fix the sync direction being wrong on MSVC
      Fix the log window not showing csync logs
      SocketAPI: Remove unecessary null-checks
      SocketApi::slotReadSocket: Small optimizations
      SocketAPI: Only push status for files requested by the shell #5361
      shell/macOS: Remove backslashes from the extension display name
      shell/macOS: Make sure the root folder's cache is cleared on disconnect
      shell/Windows: Remove unused files
      shell/Windows: Convert tabs to space
      shell/Windows: Remove the UPDATE_VIEW message handling
      shell/Windows: Fix the view not being updated on StateError
      shell/Windows: Avoid memory allocations and copies when querying icons
      shell/Windows: Update binaries to build 44
      StatusTracker: Emit OK for the last child before parents (#5467)
      Bring back the error message if the sync-exclude.lst file is missing
      Tests: Add a large sync benchmark
      Don't pass the PropagatorJob in itemCompleted
      Pass the SyncFileItem as SyncFileItemPtr in itemCompleted
      Release SyncFileItem objects with their job
      Remove duplicate SyncFileItem entries for the log
      Don't reallocate a QByteArray for each contentChecksumType call #5481
      Remove SyncFileItem::_requestDuration #5456
      Don't use the StopWatch for each job in production builds #5456
      Pack boolean members in PropagateUploadFileCommon #5457
      Clear SyncEngine::_remotePerms after the sync
      Remove PropagateDirectory::_runningNow
      Skip TestSyncEngine::abortAfterFailedMkdir
      Fix TestSyncEngine::abortAfterFailedMkdir
      Remove unneeded Q_DECLARE_METATYPE
      Fix UtilityTest on macOS
      Fix FolderWatcherTest on macOS and Windows
      Fix FileSystemTest on macOS
      Fix ExcludedFilesTest on macOS
      Fix FolderManTest on macOS
      Fix the UNIT_TESTING build on Windows
      Disable tests uncompatible with Qt4 for that build
      Revert "Fix TestSyncEngine::abortAfterFailedMkdir"
      Fix TestSyncEngine::abortAfterFailedMkdir (again)
      Replace WaitForFinishedInParentDirectory with WaitForFinished for directory moves
      Split the subjob logic out of PropagateDirectory
      Split running jobs into a separate vector
      Create PropagateItemJobs only before starting them
      Reduce the connection data used by PropagateDirectory objects
      Don't abort propagation job abortions synchronously from finished
      Potential fix for crash in PropagateDirectory::abort (#5564)
      Favor QtKeychain installed together with Qt
      Jenkinsfile: Also use 4 parallel jobs for linux builds
      Use QTemporaryDir in TestOwnSql
      Merge branch 2.3 into master
      Remove the unused folderwatcher_qt implementation
      Improve the logging message pattern
      Use Qt logging categories for logging
      Upgrade some qCDebug to qCInfo or qCWarning
      Also pass csync logs through QMessageLogger
      Add the possiblility to enable debug logging categories
      Promote a few more logs to info/warning
      Add the account name and folder when starting the sync
      shell/Windows: Update binaries to build 45
      Remove debug messages by default from sync.engine
      shell/Windows: Update binaries to build 45
      SocketApi: Improve logging
      SocketApi: Adjust the format of the mailto: URL
      SocketApi: Add GET_STRINGS:BEGIN and END
      shell/windows: Use a submenu to include private link actions
      shell/macos: Use a submenu to include private link actions
      shell/macos: Remove legacy (< 10.10) overlay icons
      shell/windows Build 46: Private links context menu
      windows: Fix a memory leak in FileSystem::longWinPath
      Don't keep the list of touched files for the whole sync
      Fix the selective sync notification folder list being cropped
      General settings: Put all advanced checkboxes in a layout
      macos: Add a sidebar icon
      Windows: Use the application icon for the sidebar
      Hardcode Desktop.ini in the exclude list
      Move csync/tests/ownCloud to test/scripts/txpl
      Move csync/tests to test/csync
      Move csync to src/csync
      Use .cpp for existing csync .cc files
      Compile almost all of csync as C++
      Enable csync logs in unit tests
      Fix cmocka deprecation warnings
      Merge pull request #5978 from owncloud/csync-cpp
      StatusTracker: Fix different case paths not matching (#5981)
      Move Utility to a new common static library
      Make csync_file_stat_t public and partly convert to C++
      Replace csync_vio_file_stat_t with csync_file_stat_t
      Replace TREE_WALK_FILE with csync_file_stat_t
      Remove csync_s::replica
      Use a C++ contructor and destructor for CSYNC
      Fix build after C++ conversion of csync
      Merge pull request #5979 from owncloud/csync-merge-filestat-types
      csync_statedb: Make sure children of non-synced items aren't read from the DB
      csync_statedb: (really) Make sure children of non-synced items aren't read from the DB
      Fix the macOS Sparkle build
      Windows: Make sure that the folder and Desktop.ini have the right attributes (#6018)
      csync: Keep the csync_file_stat_t instances created during discovery
      Replace the custom rbtree by a std::map
      Remove the usage of phash in csync
      Remove SyncEngine::_remotePerms
      Remove SyncFileItem::log
      Remove SyncFileItem::_isDirectory
      Update sync-algorithm.md
      Move non-csync-dependent parts of FileSystem to src/common
      Reverse the dependency between SyncJournalFileRecord and SyncFileItem
      Move SyncJournalDB to src/common
      csync_update: Remove the check for csync_get_statedb_exists
      SyncJournalDB: Only reset_and_clear_bindings once
      Fix the build (make install)
      SyncJournalDB: Bind phash as a qlonglong instead of a QString
      SyncJournalDB: Allow callers of getFileRecord if the query failed
      Use SyncJournalDb in csync
      SyncJournalDb: Reimplement the db_is_empty logic from csync

Jonathan Kawohl (20):
      updated link for documentation and added more info to osx build
      Correcting for PR comments
      added info on qtkeychain
      fix for https://github.com/owncloud/client/issues/1251
      fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251"
      updated link for documentation and added more info to osx build
      Correcting for PR comments
      added info on qtkeychain
      fix for https://github.com/owncloud/client/issues/1251
      fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251"
      added link to central
      added missing quotes
      removed openssl_version variable,
      adjusted minimum version.
      fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725
      fixed note
      Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
      Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
      Merge branch 'Kawohl-master'
      fixed merge conflicts

Julius Härtl (1):
      Set proper application name, icon name for freedesktop notifications

Jürgen Weigert (16):
      improved linux build instructions.
      Update building.rst
      Update building.rst
      fixed formatting lines 212 215
      Merge pull request #4201 from owncloud/jnweiger-patch-1
      Update accountsettings.cpp
      Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch
      Update CMakeLists.txt
      Update building.rst
      fix branded nemo and caja shell integration (#5966)
      Update ChangeLog
      Update release_template.md
      support old sqlite before 3.7.7
      Update CMakeLists.txt
      Update clean_tarball.sh
      use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin

Kashyap Prajapati (1):
      Broken URL fixed in Dockerfile

Kaustubh Welankar (3):
      Removed Magic Numbers in propagator #5685 (#5705)
      Fix for issue number 5692
      Change error message. Removed Qt5 if check

Kiril Vladimiroff (1):
      Remove all conditional checks for Qt 4.x (#5505)

Klaas Freitag (263):
      SyncLog Dialog WIP
      Settings: Move synclog widget to a seperate dialog.
      Merge pull request #3916 from RealRancor/fix_rst_syntax
      Merge pull request #3920 from phil-davis/guitypos
      Merge pull request #3919 from phil-davis/libsynctypos
      Merge pull request #3899 from sebasje/sebas/cmake
      SyncLogDialog: Do not delete SyncLogDialog after close.
      Propagatorjobs: Removed superflous semicolon.
      SocketAPI: String concat optimization as learned on QtWS.
      FileSystem: Reuse the FileInfo object that is created in the caller.
      Utility: add method fileNameForGuiUse(), pimp up filename for GUI
      SettingsDialog: Add new widet called ActivityWidget.
      Discovery: Fix detection of hidden files.
      Add slot to handle clicks on folder names.
      Enable external links in the label.
      AccountSettings: Add index to undecided folder to be able to select it.
      AccountSettings: Display a link for undecided dirs in the sub text.
      FolderStatusModel: Check for null argument at start.
      Merge pull request #4004 from owncloud/fix_hidden_detection
      Merge branch '2.0.2' into 2.0
      Add version suffix git.
      Merge branch '2.0'
      Merge pull request #4040 from owncloud/phil-davis-changelog-master
      Add a tabwidget to Settings dialog for activity.
      ActivityWidget: Add a job to fetch activities, Activity object added
      SettingsDialog: Make ActivityWidget a member.
      Merge pull request #4049 from Naereen/patch-1
      ActivityWidget: Do a proper asynchronous model to display the activity.
      ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
      SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
      ActivityListModel: Check if the account is connected when fetching more.
      JSONApiJob: Add method to add additional query parameter.
      ActivityListModel: Add the page and pagesize parameter to ocs query.
      ActivityListModel: Add method to refresh one Account (WIP)
      ActivityWidget: Created a delegate for prettier display of the activities
      ActivityView: Add information about the account.
      ActivityWidget: Rather use accountState pointer directly.
      ActivityDelegate: Make the row height public accessible.
      ActivityView: Add a second treeview for sync issues.
      Activity: Unify the GUI, and reactivate copy to clipboard for all.
      ActivityView: Add a progress indicator widget to indicate action.
      GeneralSettings: Remove references to protocolwidget.
      CMake version abstractions: Remove some dependencies.
      sync excludes: Add .directory files to be ignored
      ActivityWidget: implement removeAccount.
      AccountManager: new method to return AccountStatePtr from the name.
      ActivityWidget: Take the account state (connected or not) in account.
      ActivityDelegate: Gray out font if account is not connected.
      AccountSettings: Add a toolbox button for the account specific actions.
      Folderman: Added method to find local files for a rel. server path.
      ActivityWidget: Show the local path in a tooltip.
      ActivityWidget: open local file in file manager if exists.
      Added some documentation.
      AccountSettings: Address jans suggestions  in #4139
      Merge pull request #4139 from owncloud/account_toolbox
      ActivityWidget: Show the subject in the Tooltip.
      Merge branch 'newactivity'
      General Settings page: Remove the add account button.
      AcitivityWidget: Moved timespan-in-words method to utility.
      Merge branch 'master' of github.com:owncloud/mirall
      ActivityWidget: Always combine the final activity list.
      ActivityWidget: Detect new items in the list to refetch the activities.
      ActivityWidget: No progress indic. for non connected accounts.
      ActivityWidget: Make compile with Qt4
      ShareDialog: Remove Qt4 incompatible property of QScrollView.
      AccountState: Avoid ConnectionCheck if ETag job was just done.
      Use the configuration value of remotePollInterval rather than hardcoded.
      Merge remote-tracking branch 'origin/patches_list' into 2.1
      Merge remote-tracking branch 'origin/depclean' into 2.1
      SyncEngine: Handle 403 Forbidden properly.
      csync_update: Add missing comment about 403 forbidden handling.
      csync_update: refactor a bit and remove redundant code.
      Merge pull request #4159 from owncloud/fix_3490
      Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
      Merge pull request #4162 from owncloud/phil-davis-patch-1
      NetworkJobs: JSON network job now reports OCS reply code.
      ActivityWidget: display if the server does not support acitivities.
      NautilusPlugin: Fix detection of top level sync folder.
      NautilusPlugin: Fix detection of the OK status
      NautilusPlugin: Fix behaviour with files with a colon in the name.
      SyncJournalFileRecord: Fix comparison operator
      Test syncjournaldb: Fix comparison of two QDateTime objects.
      SyncJournalTest: Use valid time for the tests.
      Updated Changelog
      ActivityWidget: Fix type (#4204)
      Merge pull request #4217 from owncloud/sane_file_permissions
      Merge pull request #4219 from owncloud/fix_link_share_stable8
      ShareLinkWidget: Set state of passwd checkbox always.
      ShareLinkWidget: Stop editing progress animation if passwd is required.
      Merge pull request #4228 from owncloud/enforce_password-block
      Merge pull request #4169 from owncloud/2.1_file_exists_before_share
      AccountSettings: Update the visibility of the add account button.
      Utilities: Include math.h because of floor()
      Merge pull request #4245 from masoudcs/masoudcs-patch-1
      Backport of #4245
      shell integration: Create a plugin for nemo out of the nautilus one.
      Move version to 2.1.1 git.
      Do not use nullptr, old compilers die on it.
      csync-tests: Added some directory wildcard tests.
      NSIS: Escape line endings for NSIS correctly.
      csync_private: Fix comment about size of file id buffer
      Win Admin: Added script to create stable toolchain prj. in OBS
      csync_update: Use the csync defines rather than plain numbers.
      csync_update: Handle comparision of file types properly.
      Nemo Shell Integration: Add missing conversion script.
      csync_update: Remove unneeded checks of previous commit.
      Merge pull request #4396 from owncloud/fix_enum_csync
      Enable replacement of strange substrings also for nsh files.
      nsi translations: finally escape the NSIS lineends correctly.
      Nautilus integration: Remove Shebang from plugin source.
      Linux shell integration: Do not call sed from absolute path.
      ActivityWidget: Set timespec to UTC for JSON values.
      Utility: Make the timeAgoInWords method a bit more verbose
      Tests: Add a test for the timeAgoInWords function
      Activities: Hide if non of the accounts has the app enabled.
      AbstractNetworkJob: Add a delete job.
      Added temporar icon for notifications.
      Minor wording fixes
      New GUI class NotificationWidget.
      Display server notifications on the client (#3733)
      Notifications: Add a Progress indicator and handle job results.
      Capabilities: Add isValid check and check for notifications
      Notifications: Check capabilities if the notifications are enabled
      Notifications: Properly delete the notification check job.
      Notifications: Do a GUI tray notification if new notifciations arrive.
      Notifications: Refactor - create a notification handler class
      Activitiy: Refactor - move classes to their own source files.
      Notification: Enhance the tray message
      Notifications: Cleaner notification string build
      ActivityData: Simplified implementation.
      ActivityListModel: Code cleanups
      ocs jobs: Add a define for OCS job success.
      Notification: Fix plural handling for tray message
      NotificationWidget: Remove not needed method.
      Activity: Some documentation and better varialbe names
      Fix timeAgoInWords
      Notifications: Display timestamp of the notification in the widget
      Utility: Make sure to use UTC timestamp to compare in timeAgoInWords
      Utility: Fix plural translation.
      Notifications: Give feedback if notifcation request succeeded.
      Notifications: Remove "done" notification widgets after fife seconds.
      Notifications: Check if the account is connected before querying.
      Fix plural translation handling, remove the superflous arg()
      Notifications: Refresh the notifications based on a config value.
      Fix plural translation handling, remove the superflous arg()
      Notifications: remove notification widgets if the notification is gone.
      Notifications: Maintain a timeSinceLastCheck for every Account.
      Notifications: Fix handling of notifications to remove from the list.
      Notifications: Remove unused variable.
      Docs: Add new config option for the notification sync interval.
      ActivityData: Add source file for implementation details
      NotificationWidget: Remove accountName() and add activity() method.
      NotificationWidgetUI: Fix sizing and sizePolicy
      Notifications: Handle Notifications without an action.
      Remove explicit time spec specification as it is not needed.
      ActivityData: Declare operators outside the class
      Cleaups based on review feedback.
      Doc: Add milliseconds unit to notificationRefreshInterval doc
      Remove superflous iterator increment
      ActivityWidget: Rename blacklistActivities to blacklistNotifications.
      NotificationHandling: Use QByteArray for the verb.
      ActivityWidget: Handle plural properly in translations.
      Merge branch 'notifications'
      NotificationWidget: Handle empty message and subject properly.
      NotificationWidget: Some ui refinements.
      ProtocolWidget: handle Conflicts as not-synced items
      ProtocolWidget: Show number of non synced files in tab label.
      Folder: After sync, fire up tray notification if conflicts happened.
      ProgressDispatcher: Improve wording about conflicts.
      NotificationJobs: Set ocs header to maintain the session.
      Folder: Fixed a couple of plural translation issues.
      Merge pull request #4641 from owncloud/bubbleUpConflicts
      SelectiveSync: Verify if the list could be read from journal.
      SyncEngine: finalize properly on error with syncjournal
      Not Synced: Display only the number of not synced items in parathesis.
      Merge pull request #4645 from owncloud/fix_4633
      Merge pull request #4640 from owncloud/numberInProtocolTab
      Not Synced Tab: Use tr rather than string concat
      SyncEngine: Close the sync journal after the sync run has finished.
      SyncJournalDb: Close the db on error in getFileRecord()
      ActivityWidget: Properly set widget for the Scrollview.
      ActivityWidget: Make sure Notification are visible if Activity disabled
      Check if the record returned from getFileRecord is valid.
      Merge pull request #4656 from owncloud/close_journal_fix
      SqlQuery: Add method errorId() to get the numeric error code.
      SyncJournalDb: Handle empty filename and avoid a bogus db query.
      SyncJournalDb: Only close the db if the return code is not SQLITE_DONE
      Merge branch 'do_not_close_db_on_done'
      Merge pull request #4664 from ckamm/hiddenfiles
      SocketAPI: Use NOP only, not NONE in the share api protocol.
      Merge pull request #4659 from owncloud/fix_client_4651
      nautilus integration: Handle NOP as empty.
      Folderman: Remove one call to updateFolderView.
      SocketAPI: Remove unneeded logging.
      Merge pull request #4684 from owncloud/less_socket_api_updates
      Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt
      SyncFileStatusTracker: Add a method to handle the root item.
      Protocolwidget: Removed some leftovers from refactoring.
      ProtocolWidget: Display the recalculated number of issues.
      SocketAPI: Display a warning on the directory if there are errors
      Doc: Draft overlay icons
      Nautilus plugin: Remove the bogus logging
      Nautilus plugin: Be more robust against new states from socketapi
      SocketAPI: Return NOP state if folder is diconnected or paused.
      SyncFileStatusTracker: Remember the state of new files.
      SocketAPI: Code simplifications as asked for in the review.
      Merge pull request #4689 from owncloud/overlays_handle_root
      local_vio_win: Fix handling files that have been deduplicated
      Windows VIO: Remove unused variable.
      Merge pull request #4713 from owncloud/fix_win-sis
      Doc: Applied review feedback for overlay icon docs.
      Set base version to 2.3.0. For 2.2, please use the branch 2.2
      vio for windows: Use more graceful create file params.
      Vio for windows: Removed the overlap param again.
      Merge pull request #4748 from owncloud/win_stat_revisited
      Merge pull request #4738 from owncloud/fix_3411
      Fix nautilus and nemo plugin branding strings. (#4780)
      Added Changelog for 2.2.0
      Fix utility test: Pass a command name to do the version check.
      Fix exclude unit test, adopt to new Iface of isExcluded.
      Documentation draft to introduce notifications.
      Update changelog for 2.2.1
      excludes: Only log if the pattern was really logged. (#4989)
      SyncJournalDb: Add a method to set the name of the db file.
      Folder: For wipe reuse the journal name from SyncEngine.
      csync: Do not compute the journal name in csync_update any more.
      SyncEngine: Calculate a uniq journal name using the remote account.
      FolderMan: ensureJournalGone needs to know the exact journal name, WIP
      SyncJournalDb: Cleanup of Constructor interface.
      owncloudcmd: Adopt to new syncJournalDb MD5 based name schema.
      Fix tests for syncjournaldb
      csync: Free statedb file member before realloc
      ShibbolethView: Open a debug windows that shows cipher info. (#5080)
      Logs: Add the name of the platform we're running on to the log. (#5082)
      Make the sync journal file name a method of the Folder class.
      csync_update: Do not check to exclude .csync_journal.db
      csync_exclude: Also exclude the new syncjournal filename.
      csync_tests: Adopted to new cmocka API.
      folderman: Clean some comments
      Documentation: Mention the new format for the journal file.
      Make sync journal name generating a method of SyncJournal.
      FolderWatcher: Also ignore the new sync journal file name format.
      Show the rename target in the client log file. (#5149)
      Dolphin Plugin: Use the Application name for the socket path (#5172)
      Dolphin Plugin: Use the Application name for the socket path (#5172)
      csync: Only free the statedb filename on destroy.
      SyncJournalDb: Migrate the old csync journal to the new name.
      Folder Setup: Allow to set up more sync connects to the same folder.
      checkPathValidityForNewFolder: Catch sync folders underneath sym links.
      Fix the folderman test, adopting the checkPathValidity method tests.
      Move the journal file name generation to the syncjournaldb class.
      Utility: Add a function to check if two filenames are equal plus test.
      folderman: checkPathValidityForNewFolder - correct file path comparison
      Folderman: Some comments for the checkPathValidityForNewFolder method.
      Add a note that the source repositories need to be enabled. (#5239)
      New network job AvatarJob: GETs the account avatar from server.
      Make the Account store the avatar pixmap.
      SettingsDialog: Display the user avatar as action icon if available.
      Update ASCII-Art describing the connection check flow.
      ConnectionValidator: Set a 20 second timeout for Avatar request.
      Avatar: Set a circle mask around the avatar image.
      Avatar: Use QImage instead of QPixmap to avoid dep on QApplication.
      Only enable -fstack-protector-strong compiler flag for gcc > 4.9

Kyle Fazzari (1):
      Correctly handle possible missing GIT_SHA1. (#5401)

Lilian Besson (1):
      Reviewing, improved style, and a initializing message

Luca Lorenzetto (1):
      When creating explorer favorite use more specific windows functions (#5690)

Luca Niccoli (1):
      Fix crash due to destruction order

Lukas Reschke (2):
      Add coverity badge
      Bump year to 2016

Marcus Hoffmann (1):
      Add script to create a caja plugin. (#5262)

Markus Goetz (238):
      Merge pull request #3589 from owncloud/sharedir
      Merge pull request #3777 from owncloud/individual-it-utf8-patch
      VERSION.cmake: master is 2.1
      folderstatusmodel.h: Fix warning
      Account Settings: Expand selective sync on show #3585
      Account Settings: Show selective sync buttons after list load
      General settings: Align checkbox #3758
      ETagJob: Depth 0 for server >= 8.1 #3730
      VERSION.cmake: This is git not rc1
      VERSION.cmake: fixup
      Discovery: Call it "Checking for changes in" in UI
      OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
      Remove legacy propagator and neon
      sqlite: Update to version 3.9.1
      Merge pull request #3995 from owncloud/return-code-of-version-and-help
      legacy propagator: Remove more code
      Merge branch 'kill_legacy_propagator'
      Exclude: Add .fuse_hidden #3999
      sync-exclude.lst: More likely matching files first
      ChangeLog: Mention propagator removal
      Exclude: Add .nfs*
      Merge pull request #4058 from owncloud/client-updates
      Merge pull request #4052 from RealRancor/fix_autoupdate
      Merge pull request #4073 from RealRancor/backport_4052_2.0
      QtVersionAbstraction: Quick not neeed on OS X
      macdeployqt: Hack to make Qt 5.5 work
      macdeployqt: Also copy bearer plugins
      OS X: Fix toolbar oddity #3719
      macdeployqt: Forgot comma
      Folder Status: Use same fat ... icon as web
      Account: Show local path in tooltip
      Merge pull request #4100 from mnutt/credentials-from-url
      NSIS: Include Qt bearer management DLLs #3969
      QNAM: Use invalid configuration instead of default configuration
      Connectivity: Improve log output
      Activities: Fix on Mac #4083
      VERSION.cmake: master is now 2.2
      Connectivity: Decrease debug logging
      Connectivity: Also accept SyncEngine etag as received ETag
      Activity View: Update only if visible and when becoming visible #4083
      Activities: Only emit debug when actually refreshing
      PropagateLocalRemove: Add debug
      Connectivity: Improve reconnecting after network change/disconnect #4167
      Activity List: Improve double click handling on filenames #4168
      Account removal: Do it inside global application object
      Account removal: More crash fixes for Windows
      Account: Invalidate credentials when clicking "Sign out" #4241
      Sharing: Remove mentioning of remote users from dialog #4234
      OS X: Attempt to fix account add oddities #4237
      OS X: Fix alignment of "Copy" button in protocol #4207
      OS X: Also show desktop notifications when app is active
      Debug: Attempt to make log more useful
      OS X: Don't install legacy Finder plugin on >= 10.10 #3587
      Revert "HTTP Creds:  Do not send the password at every request"
      OS X: Don't install legacy Finder plugin on >= 10.10 #3587 (v2)
      Merge pull request #4338 from owncloud/mtimes
      Activities: Fix color when row is selected
      Changelog for 2.1.1
      SyncEngine: Improve error message for ignored files/folders #4143
      Merge pull request #4470 from RealRancor/chunksize_config
      Merge pull request #4389 from Bottswana/deleteprompt
      SelectiveSync: Improve menu #4378
      Propagator: Remove 100msec delay between jobs
      Propagator: Pump in more requests if we think current ones are quick
      Merge pull request #4529 from owncloud/dynamic_parallelism_scaling
      Merge pull request #4531 from ckamm/old-server
      Merge pull request #4552 from owncloud/hide_activity_tab
      Old servers: Don't nag if version still undetected #4523
      Merge pull request #4549 from owncloud/fix_4545
      Protocol: Show by default instead of server activity #4395
      Proxies: Enable ownBrander to force system proxy usage #4458
      SyncEngine: Also emit item in other code path
      Propagator: On remove move, take size from DB
      Submodule: Use https path
      sqlite: Update to version 3.11.1
      NSIS Silent mode: Force uninstall before install #4543
      Documentation: promptDeleteAllFiles #4389
      Exclude: Weird GoogleDrive "My Saved Places." file #4573
      OS X: Use app icon for "Share with ..." Finder menu #4472
      Merge pull request #4623 from owncloud/share_menu_icon_osx
      Merge pull request #4605 from RealRancor/RealRancor-patch-1
      CSync: Allow files with 0 mtime #1603
      Exclude: .Trash-* trash folders #4600
      Merge pull request #4686 from owncloud/allow_0_mtime_files
      OS X: Allow ampersand in APPLICATION_NAME #4657
      sqlite: Update to version 3.12.1
      Merge pull request #4683 from owncloud/fix4657
      OS X: Fix overlay installation on El Capitan #4650
      Discovery: Be more explicit about files with unknown size #4573
      Merge pull request #4696 from owncloud/issue4573_negative_content_length
      UI: Remove alias from more places #4577 #4695
      Merge pull request #4708 from owncloud/aliasGui
      UI: Fix account name/alias display oddities #4577
      Merge pull request #4744 from owncloud/fixAliasesOnceMore2
      Merge pull request #4741 from owncloud/fix-alias
      ConnectionValidator: Also set short timeout for capabilities job
      sqlite: Update to version 3.12.2
      Shibboleth: Load username from config for UI (#4751)
      Qt patches: Update with information about Qt 5.6
      NSIS: Properly uninstall both x64 and x86 DLLs #4762
      Windows: Fix Share menu #4781
      Upload: Remove bandwidth quota debug message #4837
      Checksums: Use SHA1 like in >=2.2
      SyncEngine: Set isDirectory before syncItemDiscovered
      SyncEngine: Set isDirectory before syncItemDiscovered
      Add ChangeLog for 2.2.1
      sqlite: Update bundled version to 3.13.0
      Update issue_template.md
      Connectivity: Delete job on timeout #4275
      Connectivity: Reduce ETag job timeout to 60 sec #4275
      QNAM: Try to workaround missing Qt patches #4720 #3888 #4051
      OS X: White-list the folder watcher enums
      VERSION.cmake: This is 2.2.2
      Merge pull request #4979 from jturcotte/2.2
      conffile.rst #5052
      ChangeLog for 2.2.3
      Merge pull request #5108 from owncloud/limit_library_path
      Update ChangeLog
      Update ChangeLog for 2.2.3 final
      issue_template.md: Clarifying comment
      Merge branch '2.2'
      Selective Sync: Fix request loop and show error in view (#5154)
      FolderWatcher: Act on relative paths #5116 (#5153)
      Selective Sync: Fix request loop and show error in view (#5154)
      FolderWatcher: Act on relative paths #5116 (#5153)
      OS X: Try to fix tray menu not updating correctly #5158 (#5177)
      ChangeLog: 2.2.4
      Folder/Watcher: Fix up #5174 #5153 (#5186)
      Wizard: Do the system proxy lookup in a thread (#5160)
      2.2.4: Set release date
      VERSION.cmake: We're at 2.2.5
      503: Also parse other server error message (#5228)
      sqlite: Update bundled version to 3.14.2
      Auto Start: Only set on first account setup, not all later ones
      Fixup previous commit
      Propagator: Also upload more in parallel (#5230)
      OS X: Use monochrome tray icon by default (#5229)
      Merge pull request #5102 from owncloud/chunking-ng
      Folder: Add comments after discussion about pre-selected selective sync
      Folder: Make folder only accessible by user #5282 (#5315)
      Wizard: Show if server asks for client certificate #2799 #69 (#5261)
      Fix up SSL client certificates #5213 #69 (#5289)
      First iteration ChangeLog for 2.3.0
      sqlite: Update bundled version to 3.16.1
      PropagateUploadFileNG: Delete unused map contents to free memory
      DB: Also migrate -shm and -wal to new name #3764 #5045 (#5459)
      Updater: Don't create instance for invalid URL
      Disable RTTI
      NSIS: Adjust to 5.6.2 image
      Update issue_template.md
      Merge remote-tracking branch 'origin/selective-sync-big-folder' into 2.3
      Cookies: Use different DB for different accounts (#5490)
      Don't create legacy 'folders/' subdirectory
      Revert "Disable RTTI"
      CentOS: Fix build for old compiler version
      CentOS: Another fix for old compiler version
      Old Qt: Another build fix
      ChangeLog for 2.3 additions
      CentOS: Another fix for old compiler version (2)
      Improve previous fix
      CentOS: Another attempt
      CentOS: More build fixes
      Modify Jenkinsfile for 2.3
      Message Boxes: Force to be more on top #5503 (#5536)
      Update ChangeLog
      NSIS: Don't display link on finish page
      ChangeLog for 2.3.1
      Update README.md
      Chunking NG: Also send OC-Total-Length on MOVE
      Wizard: Improve folder creation
      Wizard: Improve folder creation (2)
      Avatar: macOS support
      Server: Parse version from capabilities too #5691 (#5698)
      Some Dialogs: Bring to top on tray click #5515 #5566 (#5664)
      ChangeLog for 2.3.2
      Wizard: Don't show not-so-useful result page #5726
      Selective Sync: Open sub folder context menu #5596
      ChangeLog: 2.3.2
      Update release_template.md
      Update release_template.md
      Update release_template.md
      VERSION.cmake: This is 2.3.3 now
      Update release_template.md
      Sharing: Optionally show warning that links are public
      Sharing: Fix UI glitch when sharing is disabled
      ChangeLog: 2.4 until now
      macOS: Fix usage of qCDebug in .mm file
      Application: debug implies logdebug
      ChangeLog: More things that were done until now
      Update ChangeLog
      owncloudcmd: Explain --debug parameter
      Jenkinsfile: 2.3.3 will ship with Qt 5.
      Jenkinsfile: Run full testing
      Jenkinsfile: Run full testing
      Jenkinsfile: Run verbose tests
      Jenkinsfile: Compile in debug because of all the asserts
      Jenkinsfile: Compile in debug because of all the asserts
      test_journal.db: Add checksumtype table
      CSyncSqliteTest: Fix test
      Jenkinsfile: Some comments
      TestSyncJournalDB: Fix concurrent usage on CI
      SyncEngine: Keep local size in SyncItem #5855
      ChangeLog: 2.3.3
      check_vio_ext: Align with new UTF8 behaviour on macOS
      X-Request-ID: Send per request not per account #5853
      csync_vio: Better log for stat errors
      encoding_tests: No more iconv
      ChangeLog: More 2.4.0 stuff
      Upload: Log the checksum / file hash
      Sync Folder: Add file manager favorite also in folder wizard #455
      CMake: Print the Qt version and path #5957 #5932
      Remove qtkeychain submodule #6004
      Add clean_tarball.sh #6005
      ChunkingNgTest: CI debuggability #6015
      ChangeLog: More 2.4.0 changes
      macOS: Fix compile
      Updater: Rudimentary support for beta channel
      sqlite: Update bundled version to 3.20.1
      Excludes: During directory traversal, use QRegularExpression
      ChangeLog: More 2.4.0 changes
      ChangeLog: Re-format and re-order
      Settings Dialog: Fix display name compilation for macOS #6078
      Merge branch 'master' into 2.4
      Checksums: Use addData function
      Packaging: Require ZLIB
      owncloudcmd: Fix timestamps, Fix --logdebug
      SettingsDialogMac: Fix account display name #6078
      Changelog: 2.4 changes up to now
      sqlite: Update bundled version to 3.21
      mirall.desktop.in: Clean bogus comments #5767
      owncloudcmd: Don't need Qt Sql module
      utility_mac: Check for NULL from LSSharedFileListItemResolve #6123
      fstack-protector: Improve previous commit
      ChangeLog: More 2.4.0 changes up to now
      Notifications: Propagate "Dismiss" as DELETE to server #5922
      Update ChangeLog for 2.4.0
      VERSION.cmake: 2.4.0-rc2
      Merge branch '2.4' into 2.4.0-rc2

Martin (2):
      Documentation improvement for #5969
      Merge pull request #5974 from owncloud/Documentation_Activity_Update

Masoud Kazemi (1):
      Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'

Matthew Leeds (1):
      Fix typo in folder.cpp

Matthew Setter (33):
      Revise the FAQ entry style
      Add an FAQ entry about the sync client's sub-directory scan limit
      Merge pull request #5466 from settermjd/add-directory-limit-to-faq
      Fix several typos in the client documentation
      Update the MacOS automatic update instructions
      Add extra note about deleting .csync_journal.db
      Fixed grammar and spelling errors in the documentation
      Create a build configuration file
      Merge pull request #5545 from owncloud/grammar-updates
      Merge pull request #5547 from owncloud/update-docs-build-configuration
      Fix the Sphinx-doc build configuration
      Re-add the Makefile for controlling the build process
      Merge branch 'master' into fix-documentation-build-process
      Merge pull request #5549 from owncloud/fix-documentation-build-process
      Update client version from 2.2 to 2.3 (#5568)
      Add explanation of how to replace local sync folder to FAQ
      Revise the point about starting a clean sync
      Merge pull request #5585 from owncloud/add-replace-sync-directory-to-faq
      Fix incorrect documentation for the ownCloud command-line client
      Document the checksums addition in 10.0
      Increase the clarity of the checksum statements
      Merge pull request #5741 from owncloud/add-checksum-details
      Add explanation of how to replace local sync folder to FAQ
      Clean up the client docs removing old, outdated, content
      Merge pull request #5929 from owncloud/doc-cleanup
      Update client docs version string to 2.4.0
      Merge pull request #5762 from owncloud/update-docs-to-2.3.2
      Fix broken images in FAQ
      Fix link to download the ownCloud client
      Fix title casing to match style guide
      Minor formatting fixes
      Fix broken images in the FAQ
      Fix broken download link

Michael Nutt (1):
      SetupWizard: populate credentials from HTTP server URL

Michael Stingl (2):
      templates > .github and create release_template (#5590)
      move man rst files to separate dir

Niels van Adrichem (5):
      Added Non Shibboleth WebDAV authentication and Dav Path customization to `owncloudcmd`
      Merge remote-tracking branch 'upstream/master'
      Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
      Fixxed compile error on src/gui/share.h
      Merge remote-tracking branch 'upstream/master'

Olivier Goffart (400):
      Merge branch '2.0'
      Merge branch '2.0'
      Merge remote-tracking branch 'origin/2.0'
      Merge remote-tracking branch 'origin/2.0'
      Dolphin shell integration:  Make it work with dolphin master
      Dolphin shell integration: Add a Share with owncloud action
      Merge branch '2.0'
      SelectiveSyncTreeView: show the size for the root item (#3755)
      Dolphin shell extention: adapt to the change in KDE Frameworks
      Dolphin shell integration: share code between two plugins
      Dolphin shell integration: Renames the plugins
      Merge branch 'dolphin-plugin'
      Dolphin shell extention: Remove the KDE4 based plugin
      Dolphin Shell Extension: renamove the kf5 in the name
      Dolphin shell integration: use the owncloud icons
      Merge branch 'master'
      Account Settings: Fix crash for acocunts withour folder
      Account Settings: Don't disable double click expanding for sub folders
      Account Settings: Don't expand while clicking on the '...' button
      Folder Model: don't try to fetch data if the account is disconnected
      Fix compilation warning
      Logger: don't call qFormatLog when unessesary
      Theme: cache the QIcon::fromTheme
      Account Settings: clear the focus of the "Sign In" button when clicked
      csync_exclude: Optimize
      csync_exclude: Use PathMatchSpecA instead of PathMatchSpecW
      sync-exclude.lst: Remove entries that are hardcoded anyway
      csync_update: Don't fetch the etag in the local discovery from the DB
      csync_statedb: Use the index in csync_statedb_get_below_path
      SyncEngine: keep a static pointer to the codec
      Sharing: change coding style of enum
      Logger: speedup the sync discovery when the log is innactive
      Folder: set csync verbosity to 0 if the Logger is not there
      test/CMakeLists.txt: remove comments
      csync_exclude: Don't ignore invalid char client side (#3736)
      Network Settings: Adjust the bandwidth limit option with old Qt
      csync_vio: reuse the information from readdir in stat
      FolderStatusModel: fix getting the size of the folder in the selective sync (#3986)
      SettingsDialog: use QWidgetAction for the toolbar so the extension works
      Delete all files: make the 'Keep' on by default
      SyncEngine: remove unused functions
      Folder::wipe:  We need to shut the socket API down before removing the DB
      SocketAPI: don't trim the command #3297
      Download: Soft errors for error while resuming (#4000)
      AccountSettings:  don't disable pause when offline (#4010)
      Use the term folder sync connection in more places  #3757
      FolderDelegate: put the progressbar in place of the remote or local folder  #3403 #3569
      Merge pull request #3997 from owncloud/phil-davis-patch-1
      Settings Dialog: don't put padding on the toolbar extension
      FolderStatusModel:  reset also if a folder was renamed  #4011
      Dolphin integration: fix error icons
      SocketApi: Fix returning ignore for the root item all the time
      IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
      Account Settings: A link should make sure all the parents are expanded
      Folder Model: The item needs to be selectable for the currenIndex to appear selected
      Fix Qt4 compilation
      Propagator: Keep a meaningfull error with old server and invalid file names
      Merge remote-tracking branch 'origin/2.0'
      Quota: handle special negative value for the quota #3940
      Discovery: conding style: use const references for function parameters
      SyncEngine:  Don't whipe the white list if the sync was aborted
      Discovery: Don't leak DiscoveryDirectoryResult in case of error
      FolderStatusModel: attempt to detect removed undecided files #3612
      Sync engine: fix signal/slot connection
      owncloudcmd: add --max-sync-retries  #4037
      SyncJournalDB, clear all the queries before closing the database
      OwnSQL: add asserts in case of error that should not happen
      Discovery: silent static analysis warning
      Share dialog: a few layout adjustements
      ShareDialog: fix autocompletion took the wrong user
      ShareDialog: fix auto completion to actualy auto complete
      ShareDialog: add a QScrollArea (issue #4125 )
      ActivityWidget: fix compiler warnings
      ShareDialog:  remove the search button (#3737)
      SharedDialog: Fix the delete icon on windows and mac (#3737)
      gui: Fix some icons in highdpi
      ShareDialog: softer line separator (#3737)
      Activity Widget: Fix runtime warning
      FolderStatusModel: add hints for translators (#4158)
      ShareDialog: Keep default server permissions by default (#4152)
      Sharing: document that the two Type enum are linked
      Fix compilation warning
      ShareDialog:  show an error if the sharing API is disabled (#4126)
      ShareDialog: remove the "Premissions" label and adjust the size of the scrollarea (#3737)
      owncloudcmd:  Don't do a check that file are older than 2s (#4160)
      Dolphin plugin: build with QStringBuilder
      Dolphin plugin: build by default
      Disable some code that needs lambda with old GCC
      AccountSettings: Remove the F5 reset folder shortcut
      csync: remove PLUGIN install patch from cmake files
      Dolphin plugin: Fix compiler warnings
      Sharee.cpp: Get rid of lambdas because we still need to support GCC 4.4
      Systray: Use the original name for the rename notification #4295
      PropagateLocalRemove: Make it possible to remove read only files (#4277)
      csync_vio_local_stat: Win: fetch mtime and size if not previously fetched
      gui: Word Wrap in QInputDialog (#4197)
      SocketAPI: SHARE: Fix the paths when creating the share dialog
      Merge remote-tracking branch 'origin/2.1'
      Attempt to recover from backup restoration on the server
      Fix RTL languages in sync dialog #4336
      HTTP creds:  Fix GUI blocking for 5 seconds when entering wrong password
      HttpCredentials::slotAuthentication:  fix comment
      SettingsDialog: show "Account" for the tab name for branded client
      Sharing: Display the error from the server when trying to share with users or group
      Sharing: feedback when there is no result while searching for an user #4348
      ConfigFile: Create the directory when using --confdir and it does not exist
      FolderDelegate: fix positions and margin
      SyncEngine: For server older than 8.1, ignore invalid char in new directories
      Upload: Chunk size can be changed in the config file
      AccountSettings:  fix Add Folder button size #4373
      SyncEngine: fix inode after move if the file has moved on the file system
      fix compilation with TOKEN_AUTH_ONLY
      Discovery: don't ignore recall file #4420
      Merge pull request #4437 from owncloud/dev/doninstalltests
      Merge remote-tracking branch 'origin/2.1'
      Use a constant for ConnectionValidator::DefaultCallingIntervalMsec
      ConnectionValidator: Make sure we intercept propfind error
      Merge branch restore_backup
      SyncJounral: add an index on the error blacklist table
      Use oc:size instead of quota-used-bytes to get the sizes of folder (#4459)
      Cleanup syncengine after the new option not to ask confirmation when everything is removed
      Selective sync: Don't show negative size
      AccountManager: take theURL from the Theme rather than from the config if the theme specify it
      Chunking: change the default chunk size to 10MB
      PropagatorDownload: fix possible crash
      Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"
      Checksums: keep the transfer checksum in the database as the content checksum
      Merge pull request #4513 from owncloud/csyncContextToSyncEngine
      Shared dialog: move the error label up (#4348)
      Never overwrite the size from the db when updating the metadata
      User-Agent: put the actual version string in there
      Theme: document forceSystemNetworkProxy (#4458)
      Merge pull request #4615 from owncloud/socketApiRefactor
      SyncEngine: fixed restoring files when they are moved in a new directory
      Merge branch '2.1'
      Handle setFileRecord errors #4632
      Merge pull request #4648 from owncloud/handle-database-errors
      CMakeLists: fix Qt4 build
      ActivityWidget: Fix Qt4 build
      ActivityWidget: use a QHash for  _widgetsToRemove
      Merge pull request #4658 from owncloud/fix-qt4-build
      CMakeLists: move QtKeychain detection in client
      Dolphin Plugin: rename the files to the branded name #4669 (#4672)
      AccountManager: take theURL from the Theme rather than from the config if the theme specify it (#4591)
      Checksums: remove the downloadChecksumValidationEnabled option
      Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
      owncloudcmd: Save the selective sync list on the first run
      Quota: Add branding option for the base folder (#4714)
      Theme: missing virtual keyword
      QTokenizer: fix Qt4 build
      Folder: Generate an alias for new folders
      Workaround ubuntu 16.04 systemtray bug (#4693) (#4747)
      AccountSettings: context menu: don't rely on the alias
      Merge remote-tracking branch 'origin/2.2'
      PropagateDownload: Throw an error if the file is empty while it should not have been (#4753)
      Merge remote-tracking branch 'origin/2.1' into 2.2
      Merge pull request #4769 from orion1024/curl-check-in-perl-tests
      ShareDialog: show the error message in red
      Propagator: fix qt4 build
      Dolphin plugin: fix build with branding
      SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do
      Merge remote-tracking branch 'origin/2.2'
      Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set
      FolderWizard: remove dead code and fix the alias
      Utility: Fix translation of second, minute, hour
      Upload: put the job in the active list while doing the checksum computation.
      SyncEngine: invalid the blacklist entry when the rename destination change
      Merge remote-tracking branch '2.1' into 2.2
      SyncEngine: cleanup setting isDirectory
      Merge branch '2.2'
      Utility: Better fix for the translation of minutes, seconds, ...
      GUI: don't force the environment variable for high DPI on linux.
      Folder: Ignore change from the watcher if the file has not changed its mtime or size (#4942)
      Folder: fix removing folder with escaped characters (#4943)
      Fix compilation on windows
      Fix docker build instruction for windows
      PropagateUpload: fix crash in PUTFileJob::slotTimeout
      SyncEngine: make abort and closing more robust
      Checksum speedup. (#4968)
      GUI: Show link to the page that allow to add a new token (#4963)
      Fix the URL from previous commit
      AccountManager: Don't force the server URL while loading the config.
      Fix Qt4 build
      Qt4: don't require a X server in the tests
      Qt4: don't require a X server in the tests
      Merge pull request #5025 from ArthurChiao/bugfix_#5015
      Merge pull request #5016 from owncloud/overrideurl
      Merge remote-tracking branch 'origin/2.2'
      CleanupPollsJob: Fix possible leak
      Qt4: don't require a X server in the tests
      SyncEngine: Reads the data-fingerprint property (#5056)
      ownsql: handle QByteArray without converting to QString (#5097)
      SyncEngine: Fix detection of backup (#5104)
      Propagator, remove the QNAM in the name as the alternative has been removed a long time ago
      Qt4 Compile
      Upload: refactor the upload in two classes so the new chuning can be implemented
      WIP: new chunking algorithm
      Chunking-Ng: Resume
      ChunkingNg: enable depending on an environment variable
      Chunking-NG: Qt4 compile
      Chunking-NG: use new dav URL for the move
      Chunking-NG: Some fixup after feedback from the pull request #5102
      FolderStatusModel:  Fix beginInsertRow/endInsertRow
      ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
      Allow to disable Shiboleth to build without QtWebkit (#5166)
      CleanupPollsJob: Fix possible leak
      ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
      Revert "FolderWatcher: Act on relative paths #5116 (#5153)"
      Folder: Cannonicalize the path
      Revert "FolderWatcher: Act on relative paths #5116 (#5153)"
      ConnectionValidator: properly handle error in status.php (#5188)
      SyncEngine: Fix renaming of folder when file are changed (#5195)
      ConnectionValidator: fetch the account name.
      Chunking-NG: Fix destination URL
      Chunking-NG: use OC-If-Destination-Match instread of If-Match
      Chunking-NG: The MOVE will return the code 204 if the file was already there
      Chunking-NG: add some headers when uploading chunks
      ConnectionValidator: properly handle error in status.php (#5188)
      Propagator: properly send the success flag (#5189)
      SyncEngine: Fix renaming of folder when file are changed (#5195)
      owncloudcmd: fix --silent
      Missing Inc -> GmbH  (#5181)
      OwnSQL: avoid crashing in SqlQuery::reset_and_clear_bindings
      AccoutWizard: Change the set policy of a radio button
      Theme: Fix compiler warning
      SyncJournalDB: check the return value of the prepare statements in checkConnect
      Remove usused variable
      AccountManager: do not load invalid account
      TestFolderMan: don't pollute user's settings
      SyncEngine: Fix renaming a folder should keep the selective sync state
      QProgressIndicator: update copy from upstream
      SyncEngine: Permission error in subfolder of a folder that cannnot be added is a SoftError
      Merge remote-tracking branch 'origin/master' into chunking-ng
      ChunkingNG: Use the 'If' header
      Merge remote-tracking branch 'origin/2.2' into master
      Chunking-NG: Enable if the server supports it
      Merge remote-tracking branch 'origin/master' into chunking-ng
      Fix compile after merge
      ChunkingNG: Add Test
      SyncEngine: disable heuristics for backup restoration for server >= 9.1
      ChunkingNG:  remove stale files when resuming
      Merge remote-tracking branch '2.2' into master
      Chunking-NG: code cleanup after review
      Merge pull request #5266 from rmekarni/patch-1
      Merge pull request #5267 from payload/fix_4608
      Merge pull request #5304 from owncloud/Kawohl-linktocentral
      FolderStatusDelegate: Fix compiler warning.
      SyncEngineTestUtils: Do don't allocate a buffer for the whole file
      Discovery: consider also the "shared by me" as shared
      Rename SyncFileStatus::sharedWithMe to shared
      Revert "Discovery: consider also the "shared by me" as shared"
      libsync: Don't store the remote URI in the csync or in the SyncEngine
      Propagator: don't use dynamic_cast for QObject
      owncloudcmd: Don't put the password in the URL
      libsync: use the new webdav url if the server reports it
      libsync: Clear the upload info after several retries (#5345)
      Account::slotHandleSslErrors: add guards in case the reply gets deleted in the dialog event loop
      Propagator: make sure every network job has a parent
      FolderStatusModel: Fix insert/remove items when there are labels
      HTTPCreds: remove all cookies when logging out (#5383)
      SelectiveSync: adjust the position of the "Loading" label
      Fix compilation with Qt 4
      Fix more compilation errors with Qt 4
      Sync Engine: Specify what chars are not syncable in the error message #1733 (#5449)
      ChunkingNG: delete stale chunks if the file was changed locally
      ChunkingNG: remove stale chunks when cleaning the uploadInfo table
      ChunkingNG: Add some tests
      ChunkingNG: add '0' padding on the filename (#5476)
      Merge pull request #5480 from owncloud/chunking-ng-cleanup
      Discovery: Add branding option to disable default sync of 'M' directories
      Wizard: Add options to ask confirmation for external storage
      Discovery: Filter 'M' out of permissions for non root storage
      FolderStatusModel: Different icon for external storages
      Wizard: Increase the size
      Confirm External Storage: adjust the notification message
      General Settings: Make sure to reload the settings when an account is added
      Account Wizard: don't whitelist everything on the first sync if we still want to confirm big folder
      Merge remote-tracking branch 'origin/master' into 2.3
      AccountManager: Fix small leak in the account migration code
      Folder: Change the wording for the massive deletion message
      Folder: remove unused variable
      Merge remote-tracking branch 'origin/2.3'
      Folder: Keep files option after aboutToRemoveAllFiles should not clear selective sync list (#5531)
      AccessManager: don't set an invalid network configuration on linux (#5538)
      Propagator: Fix t8.pl
      Verify that all strings are properly escaped (#5558)
      SslButton: Remove additional ')'
      2.3.0 was released: Update version
      Merge branch '2.3'
      VERSION: master branch is 2.4
      Propagator: Fix finished signal of directory being emited twice and causing crash
      ActivityListModel: fix possible crash in slotActivitiesReceived
      Merge remote-tracking branch 'origin/2.3'
      Fix TestSyncEngine::testDirDownloadWithError
      Propagator: Attempt to fix a crash in OwncloudPropagator::scheduleNextJob
      Ignore list editor: adjust the size of the columns in the table
      Ignore list editor: adjust the size
      Attempt to fix a crash in FolderStatusModel::slotUpdateDirectories
      SyncEngine: fix test regression in TestChunkingNG::testCreateConflictWhileSyncing
      Merge remote-tracking branch 'origin/2.3'
      Propagator: change order of destruction
      ActivityListModel: attempt to fix a crash.
      Merge remote-tracking branch 'origin/2.3'
      Folder::showSyncResultPopup: Fix undefined behavior when there is no errors
      owncloudsetuppage.ui: Remove that file, it is unused
      VERSION: 2.3.1 was release, this branch is now for 2.3.2
      AccountState: Attempt to fix a crash
      PropagateDownload: fix possible crash
      owncloudcmd: return code depend on sync result
      Merge remote-tracking branch 'origin/2.3'
      Merge remote-tracking branch 'origin/avatar_pics'
      Require Qt5
      Better words for the error message when one cannot create the database.
      Exclude list: remove .htaccess
      Discovery: Increase the MAX_DEPTH and show deep folder as ignored
      Don't call QElapsedTimer::restart on uninitialized timer
      Authentication with OAuth2
      ownsql: fix build on jenkins
      FolderStatusModel: fix assert in Qt when the list of subfolder is empty
      OAuth: Fix the secret to the one from commit 05fd985f9f in the oauth2 repository
      ownsql: fix build on jenkins
      SyncEngine: SelectiveSync: Remove local files of undelected folder despite other modified files
      OAuth: Error handling in the wizard
      Wizard: Don't let the second to last page go back with OAuth2
      Don't link dirrectly against openssl
      OAuth: cleanup debug messages
      AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
      Fix check_csync_exclude test
      Fix check_csync_update
      main.cpp: Fix a compiler warning
      OAuth: Redirects to the server in case of sucessfull login
      csync: Remove iconv depedency
      csync: Move the locale<->utf8 conversion to a different file
      csync: Use Qt for encodeing/decoding filesystem strings
      OAuth2: Have a link to the browser in the owncloud UI
      OAuth: Better message when loggin in with the wrong username
      Merge pull request #5326 from owncloud/cleanup_tests
      HTTP/2 Support
      AccessManager: Disable HTTP/2 without TLS
      Merge pull request #5905 from kaustubh-welankar/issue_5692_pull
      PropagateUpload: Remove the Qt workaround against data corruption
      OAuth: Add the user in the authorize call
      Propagator: fix a qMax which should have been a qMin
      buildint.rst: Put back reference to openssl on windows
      Revert "Revert "Discovery: consider also the "shared by me" as shared""
      OAuth: Fix refresh of token after expiration
      OAuth: clear refresh token when the server claim not to support oauth
      AccountState: reset _waitingForNewCredentials when signin in
      FolderWizard: fix crash in FolderWizardRemotePath::slotHandleLsColNetworkError
      Gui: Allow to add multiple sync folder connection of the same folder
      Remove settingsdialog.cpp.Rbt431
      Gui: Use lambda instead of QSignalMapper
      Include <QAuthenticator> from code that connect to signal that uses it
      test/stub: add some call required by the next patches
      Use the Qt5 connection syntax (automated with clazy)
      DiscoveryPhase: use the new syntax in disconnect
      Port to new signal-slot syntax what cannot be done automatically
      RemotePermissions: Store in a class rather than in a QByteArray to save memory
      csync: remove unused type
      csync_update/reconcile: replace CSYNC_LOG with qDebug/qInfo
      csync_vio_local: merge readdir and stat in the same call
      OAuth2: Fix double slash in URL
      Httpcreds: Fix double slash in the Request App Password url
      csync_update: fix assert
      chsck_vio: fix readdir test by removing it.
      csync: use a unordered_map for the FileMap
      c_utf8_from_locale: optimize the UTF8 case on Linux
      benchlargesync: Do several syncs
      PropagateUpload: Fix another non-normalized connect that appears while profiling
      bandwidthmanager: Fix unregistering devices on delete
      OwnSQL: don't parse the error message when we are done
      OAuth: Fix crash when closing the browser while identifying
      Use QDateTime::currentDateTimeUtc instead of the non utc version
      csync_reconcile: Optimize reconcile by avoiding alocations
      csync_rename: optimize lookup
      Fix encoding of version string
      OAuth: fix compilation with old gcc
      SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA
      Test OAuth2
      fixup! [tx-robot] updated from transifex
      CMakeLists.txt: Put -pie as a linker flag were it belongs
      Use qEnvironmentVariable* instead of qgetenv when appropriate
      Shibolleth: raise the browser when clicking on the tray
      owncloudsetupwizard: Fix "add new account" if the wizard is already visible
      Sharing: remove the ShareManager::_jobContinuation
      SyncEngine: remove SyncEngine::syncItemDiscovered
      SyncFileStatusTracker: Detect changed in the shared flag
      ShareDialog: trigger a sync for folder affected by a change of sharing
      Theme: Update the wizard size on high dpi screen
      test/testsyncengine: test for PR #6168
      Checksum: Ignore unkown OC-Checksum header when downloading...
      AccountSettings: Use the proper position to show the menu over sub-folder
      TestChunkingNG: Test that resuming does not send past data.
      csync_update: ignore remote files that cannot be encoded
      libsync: Fix compilation with TOKEN_AUTH_ONLY
      AccountSettings: Fix the size of the "Add Sync Folder Connection" button
      FolderWizard: Fix minimum size
      test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC
      Shibboleth: Upgrade to OAuth2 When the server supports it
      Jenkinsfile: Fix compilation

Phil Davis (7):
      Coin the term 'folder sync connection'
      libtypos comment and message typos for master
      GUI comment and message typos for master
      ChangeLog 2.0.2 minor typos for 2.0 branch
      ChangeLog typos that reverted in merge from 2.0
      tagLastSuccessfullETagRequest comment wording
      Fix Mac PATH command

Piotr M (3):
      add server capabilities to owncloudcmd
      reduce number of loops
      dynamic chunking prototype

Piotr Mrowczynski (2):
      Classify chunked items correctly. Issue #5850
      Fix paused sync file move issue #5949

Piotr Mrówczyński (4):
      Merge pull request #5170 from owncloud/add_capabilities_owncloudcmd
      Merge pull request #5274 from owncloud/reduce_loops_dirjob
      Add capability to disable parallel chunked upload #5364 - technical review (#5403)
      Delete finished propagation jobs in PropagateDirectory #5269 (#5400)

RealRancor (6):
      Fix registry key syntax in FAQ.
      Fix linkname in architecture.rst.
      Make registry key a code block in autoupdate docs.
      Backport #4052 to 2.0
      Add chunkSize config to documentation
      Change note to warning in documentation

Robin Geuze (1):
      Fix Qt4 build

Roeland Douma (17):
      Merge pull request #3923 from owncloud/check_shareapi_available
      Merge pull request #3661 from rullzer/public_upload
      Merge pull request #3773 from owncloud/split_sharedialog
      Merge pull request #4033 from owncloud/share_object
      Merge pull request #4055 from owncloud/user_group_sharing
      Merge pull request #4133 from owncloud/sharedialog_uit_improvements
      Merge pull request #4199 from owncloud/permission_dropdown
      Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
      Merge pull request #4496 from owncloud/fix_4325
      Merge pull request #4497 from owncloud/fix_4469
      Merge pull request #4493 from owncloud/fix_4185
      Merge pull request #4501 from owncloud/fix_4481
      Merge pull request #4553 from owncloud/add_spinner
      Merge pull request #4687 from owncloud/fix_share-permissions-namespace
      Merge pull request #4700 from owncloud/fix_4409
      Merge pull request #4717 from owncloud/fix_webdav_property
      Add spinner during sharee search (#4764)

Roeland Jago Douma (53):
      Extended capabilities API
      Add SHARE_STATUS socketAPI command
      Also parse capabilitie for public uploads
      Allow setting op public upload on link shares
      Split sharing code
      Added setPublicUpload to OcsShareJob
      OCSJob -> OcsJob and more docs
      Now add parameters in a less crappy way
      Thumbnailjob fixes
      Remove unused members
      Move permissions to OcsShareJob
      Now only 1 constructor to ocssharejob
      Use overloaded functions
      Typos
      Add share manager and the share objects
      Added getPublicUpload to LinkShare
      Make sure enforced passwords are properly respected
      Fix typos
      Proper const usage
      Properly cleanup OCS jobs
      Proper foreach
      Shares do not have parents
      Use QLatin1Char
      Act properly if OCS endpoint returned an error (OCS error)
      Use proper QFlags
      [Sharing] Add setpermission to sharing code
      [Sharing] Add user/group sharing dialog
      [Sharing] First step towards proper group sharing
      [Sharing] Allow sharing with users/groups from desktop
      [Sharing] Reorganized sharedialog code
      [Sharing] Filter sharee list properly
      [Sharing] Properly delete widget
      [Sharing] Clear completer on activation
      [Sharing] Build sharee list on every search
      [Sharedialog] Fix UI stuff
      [Sharing] Delete animation when share is removed
      [Sharing] Make sure the file is actually synced to the server
      [Sharing] Also add sync status to SHARE_STATUS command
      [Sharing] Permissions now in dropdown menu
      [Share] Use more icon
      [Sharing] Files should not have create permissions
      [Sharing] Default capabilitie for link sharing
      [Sharing] Do not allow users to uset the password if it is enforced
      Add theming options control sharing operations
      Lock the sharee input when sharing
      Disable sharing dialog if account state is not connected
      Do not send reshare permissions when creating a federated share
      Add spinner to show we are creating the share
      The share-permissions namespace was moved
      Use expireDate if returned by the OCS Share API
      Only 1 : between namespace and property
      Update windows docker file to use 2.3 OBS repo
      complete url when using themed wizardUrlPostfix

Romain Mekarni (1):
      Fix find_library FindCMocka.cmake

Samuel (1):
      Fixing a typo on a message

Samuel Alfageme (10):
      Reference to build Qt5 with qtwebkit support in the docs #5129 (#5471)
      Using different window flags on the connection method dialog (#5614)
      Including some info on the proxy config. in the docs.
      Fixing a typo on an issue reference
      Removed the coverity badge
      Fixing a duplicate in the build instructions
      Update central.owncloud.org link
      Update central.owncloud.org link
      More refs. to corresponding issue/PR on 2.3.3 changelog
      Changelog Updated with latest changes

Sebastian Kügler (1):
      Simplify creating the library path

Stephen Colebrook (2):
      Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. (#4902)
      Search results are filtered by server. Don't filter a second time.

Thomas Müller (7):
      Adding new resource for the desktop.ini file
      Add Jenkinsfile (#5041)
      Add Jenkinsfile (#5041)
      Merge pull request #5069 from owncloud/Jenkinsfile-2.2
      Jenkinsfile: Add win32 build (#5091)
      [2.2] Jenkinsfile: Add win32 build (#5091) (#5115)
      Use display-name from the ocs call in the settings dialog

Tobias Haeussler (1):
      Add manifest file on Windows to make the application UAC aware.

Tommy Sparber (2):
      Improve macOS SysTray/StatusBar monochrome icon (#5227)
      Move check for mono icons into separate function

ajasja (1):
      Documented the usage of environment variables.

arthurchiao (3):
      fix #5015 overlay icon not show: compare folder paths with no case-sensitivity
      ignore case-sensitivity only on windows
      be case insensitive for MacOSX, too

ckamm (44):
      Merge pull request #3951 from ckamm/checksum
      Merge pull request #4527 from ckamm/account-pause
      Merge pull request #4512 from owncloud/add-checksum-to-database
      Merge pull request #4532 from ckamm/content-checksum
      Merge pull request #4618 from ckamm/progressui
      Merge pull request #4630 from ckamm/folderwatchwin
      Merge pull request #4673 from ckamm/shareperm
      Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate
      Merge pull request #4739 from ckamm/trackdirty
      LockWatcher: Keep an eye on Windows file locks (#4758)
      Use natural sorting for filenames if available #4859 (#4864)
      Progress info: Reset between syncs #4856 (PR #4872)
      Remember to upload files that are locked during a sync run (#4865)
      Progress: Don't count items without propagation jobs #4856 (#4910)
      Certs: Re-ask for different cert after rejection #4898 (#4911)
      Workaround for Ubuntu 16.04 tray issue #4944 (#4947)
      Move touched-files tracking to SyncEngine #4927 (#4946)
      Share dialog: Add 'Mail link' button #3261 (#4961)
      Performance: Don't redundantly add the same exclude files #4967 (#4988)
      Setup csync logging earlier (#4991)
      csync: Use the full file stat destructors (#4992)
      Share: Permissions for federated shares on servers >=9.1 #4996 (#5001)
      SocketAPI: Use different pipe name #4977 (#4997)
      Fix windows HiDPI #4994 (#4998)
      Windows: Skip symlinks and junctions again #5019 (#5036)
      Sharing: Fix bug with file names containing percent encodes #5042 (#5043)
      Progress: Don't display unlikely estimates #5046 (#5066)
      Tray menu: Update only on demand #4990 #4985 (#5072)
      Merge pull request #5174 from owncloud/fix5116_2
      Excludes: Consider files in hidden folders excluded #5163 (#5173)
      Tray: Workaround collection (#5179)
      Improve the "new big folder" UI #5202 (#5204)
      Doc: Add sync algorithm overview and comments (#5277)
      Merge pull request #5272 from owncloud/licensefix-pending
      Merge pull request #5045 from owncloud/dbjournal_per_account
      Build: Enable Q_ASSERT in release mode (#5425)
      Don't blacklist 507 Insufficent Storage #5346 (#5424)
      Reset stuck chunked uploads eventually #5344 (#5443)
      Settings: Don't migrate settings on access error #5499 (#5523)
      Merge pull request #5518 from ckamm/asserts
      FolderStatusModel: Fix crash for empty relativePath (#5713)
      Fix a crash in ProxyAuthHandler (#5711)
      Merge pull request #5695 from ckamm/sharedialog-multiplelinkshares
      Add a more functional error view #5516 (#5861)

dheule (1):
      added owncloudcmd bandwidth limit parameter (#5707)

hefee (2):
      use SHAREDIR for i18n
      A final release version number breaks this regex (#4835)

hh.lohmann (2):
      /doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
      /doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"

octotree (1):
      Symlink Support for Dolphin Plugins (#5428)

orion1024 (1):
      Adding CURL check in t6.pl

rockihack (4):
      Enable DEP & ASLR on Windows
      Linux Hardening
      Enable stack-protector-strong on Windows and macOS.
      stack-protector is not supported on hppa.

-----------------------------------------------------------------------

This annotated tag includes the following new commits:

       new  63cf0e3   [tx-robot] updated from transifex
       new  40665c0   [tx-robot] updated from transifex
       new  9a4871a   [tx-robot] updated from transifex
       new  529bcab   [tx-robot] updated from transifex
       new  480932a   Checksum: Ignore unkown OC-Checksum header when downloading...
       new  86c2e9e   Tray: Fix 'Open folder' action creation
       new  14a5145   Link share: Move 'delete' button to the bottom #6163
       new  e7a91a1   AccountSettings: Use the proper position to show the menu over sub-folder
       new  658a8c0   mirall.desktop.in: Clean bogus comments #5767
       new  72783aa   [tx-robot] updated from transifex
       new  96dede4   TestChunkingNG: Test that resuming does not send past data.
       new  01377f6   [tx-robot] updated from transifex
       new  7a790c8   [tx-robot] updated from transifex
       new  72809ef   csync_update: ignore remote files that cannot be encoded
       new  e99d640   [tx-robot] updated from transifex
       new  c0ae96e   [tx-robot] updated from transifex
       new  753d7ad   libsync: Fix compilation with TOKEN_AUTH_ONLY
       new  b844405   AccountSettings: Fix the size of the "Add Sync Folder Connection" button
       new  7a80fe4   [tx-robot] updated from transifex
       new  6cc5ce7   [tx-robot] updated from transifex
       new  482d538   [tx-robot] updated from transifex
       new  cde6589   owncloudcmd: Don't need Qt Sql module
       new  6276d92   utility_mac: Check for NULL from LSSharedFileListItemResolve #6123
       new  e86937e   [tx-robot] updated from transifex
       new  30e3932   FolderWizard: Fix minimum size
       new  58bcbba   [tx-robot] updated from transifex
       new  5ff3e44   [tx-robot] updated from transifex
       new  e0954b0   test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC
       new  10efe1f   [tx-robot] updated from transifex
       new  823c746   [tx-robot] updated from transifex
       new  f2beaba   [tx-robot] updated from transifex
       new  ee98daf   Shibboleth: Upgrade to OAuth2 When the server supports it
       new  0be7b6f   Only enable -fstack-protector-strong compiler flag for gcc > 4.9
       new  0479322   fstack-protector: Improve previous commit
       new  b29e9b9   move man rst files to separate dir
       new  1a1ab92   make doc-man working again.
       new  755ef01   ChangeLog: More 2.4.0 changes up to now
       new  67d77dd   [tx-robot] updated from transifex
       new  ac93703   [tx-robot] updated from transifex
       new  99f32dc   Clear csync rename mappings after reconcile
       new  ceac18c   Reconcile: Rename maps are consistent with update phase #6212
       new  a1136e7   [tx-robot] updated from transifex
       new  3485109   Jenkinsfile: Fix compilation
       new  fc8c88b   [tx-robot] updated from transifex
       new  ca48ff7   [tx-robot] updated from transifex
       new  9a835af   [tx-robot] updated from transifex
       new  36573a5   [tx-robot] updated from transifex
       new  3e294d5   [tx-robot] updated from transifex
       new  dcf0baa   Journal: 64bit inodes, fix storing uint64s generally
       new  530853c   [tx-robot] updated from transifex
       new  75676f8   Notifications: Propagate "Dismiss" as DELETE to server #5922
       new  1b2a8ba   Enable stack-protector-strong on Windows and macOS.
       new  5cc3b52   stack-protector is not supported on hppa.
       new  b357003   [tx-robot] updated from transifex
       new  8d5afff   Update ChangeLog for 2.4.0
       new  47d282f   VERSION.cmake: 2.4.0-rc2
       new  79dd8e9   [tx-robot] updated from transifex
       new  298f1ab   Disable stack protection for mingw win32 builds in 2.4
       new  61939d6   Merge branch '2.4' into 2.4.0-rc2

The 59 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list