[Pkg-owncloud-commits] [owncloud-client] annotated tag v2.2.0 created (now 4da153c)

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu May 12 16:26:00 UTC 2016


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

hefee-guest pushed a change to annotated tag v2.2.0
in repository owncloud-client.

        at  4da153c   (tag)
   tagging  49a678a26fe02b55437ea0766078795901db1f0e (commit)
  replaces  v2.0.2-oem
 tagged by  Daniel Molkentin
        on  Thu May 12 17:08:59 2016 +0200

- Log -----------------------------------------------------------------
ownCloud Desktop Client release 2.2.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: GPGTools - http://gpgtools.org

iQIcBAABAgAGBQJXNJyTAAoJEEmMRevpTns3UVEQAJC97j9AleyGZDaODiXy6erc
f3FzAxHnwDKhDMeR7r10VSFpBaZcIaxbsmOFf5UZ5WCaiJM3LrwP+WgNj2yTMWRS
GvnHXsXN5uysigaZfvonsUHmr58zkeXriv+6lDYe45/pbozzI3m29mzEsm71kNlP
icBBzB34oSRXpeN/tgFwOAgnJArVCaNzQDuq+MgIGPA81qgZMJgC8DNvEh9PaDP1
baLGxwuqtMqOEV5m6A2q1uB3N1Oh0Nw/V8FZ696ecWW2bLw3tBErkwkftI46ldk8
TTWvwBvo3xgWEDP7gx/SXmbs3QWVD+eJJIH47Qf6bSFkGRYc5rI6+biy0YqM2jpC
XVdHj7azkXeRsWQ37sg5+9zECc0Llrx4IKJ6i16soDaTVpAonhTRrv+7X3uZXelA
svxJOKdGdXuhzxe/pPlXA6/JSOhzhzJAdJSq3+gMWiDGlA0c8xNCrOXw/pkXrQrC
qojNBZqxt7LZ6oYhdrWtk/rSmIFHqO5xwDlLhNi4WRl4qCeOBIqbqgiPbwCquzLt
CQDfVMABVh0MEVCtlGvIOpnHpX0S/PQdab68xO0VoEC5bIzk0/vrG0jKazmmpSYf
U++A3yfRZyv5u4wHBckCD3B75SEy8tspFzn4dWru3DYniFV4QsxqHibbSqAfIAgK
KQ35qZQNGUpTeapKABGL
=Htiy
-----END PGP SIGNATURE-----

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

Carla Schroder (25):
      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

Christian Kamm (159):
      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
      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

Daniel Molkentin (79):
      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
      2.2.0 final

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

Hefee (3):
      Don't install tests and cmocka lib.
      fix typo occured->occurred
      Merge branch '2.1'

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 (174):
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-robot] updated from transifex
      [tx-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 (67):
      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
      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)

Jürgen Weigert (5):
      improved linux build instructions.
      Update building.rst
      Update building.rst
      fixed formatting lines 212 215
      Merge pull request #4201 from owncloud/jnweiger-patch-1

Klaas Freitag (220):
      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.
      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.

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

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

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

Markus Goetz (101):
      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

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

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

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 (158):
      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
      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
      ShareDialog: show the error message in red
      Propagator: fix qt4 build
      Dolphin plugin: fix build with branding

Phil Davis (6):
      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

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

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 (51):
      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

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

Thomas Müller (1):
      Adding new resource for the desktop.ini file

ckamm (10):
      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)

hefee (1):
      use SHAREDIR for i18n

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"

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

This annotated tag includes the following new commits:

       new  40395bd   VERSION.cmake: master is now 2.2
       new  0763f65   improved linux build instructions.
       new  06bb97e   Update building.rst
       new  f54f486   Update building.rst
       new  895f0b2   Merge remote-tracking branch 'origin/2.1'
       new  e273743   AccountSettings: Remove the F5 reset folder shortcut
       new  903dd8a   Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
       new  f2c9a49   fixed formatting lines 212 215
       new  e67bb1c   Merge pull request #4201 from owncloud/jnweiger-patch-1
       new  ae806e8   Merge remote-tracking branch 'origin/2.1'
       new  8f26bb6   Merge pull request #4245 from masoudcs/masoudcs-patch-1
       new  639301e   Merge remote-tracking branch 'origin/2.1'
       new  1bb76f5   Attempt to recover from backup restoration on the server
       new  f705c56   AccountSettings: Auto-expand only single folders #4283
       new  62ded39   Update: Check checksum for renamed files #2983
       new  3b60f6e   Sharing: Fix resharing items with limited permissions #4357 #4358
       new  74a8c4a   Add additional configuration option to toggle display of delete prompt
       new  d8af949   Alter sync engine to check new setting before displaying prompt
       new  dd76d72   Merge remote-tracking branch 'origin/2.1'
       new  aa8b772   Don't install tests and cmocka lib.
       new  f442195   Remove option from GUI, leaving config option only.
       new  16ab3ca   Merge pull request #4437 from owncloud/dev/doninstalltests
       new  93308fa   Merge remote-tracking branch 'origin/2.1'
       new  96f50d0   Nautilus integration: Remove Shebang from plugin source.
       new  e9307bb   Use a constant for ConnectionValidator::DefaultCallingIntervalMsec
       new  41d8d77   Merge remote-tracking branch 'origin/2.1'
       new  893e226   ConnectionValidator: Make sure we intercept propfind error
       new  c93ecfb   Merge branch restore_backup
       new  7db3bc9   Bump year to 2016
       new  49ba58e   Merge pull request #4461 from owncloud/bump-year-to-2016
       new  83adb7b   [tx-robot] updated from transifex
       new  cd83772   SyncJounral: add an index on the error blacklist table
       new  dd89ab5   Use oc:size instead of quota-used-bytes to get the sizes of folder (#4459)
       new  14de3b4   [tx-robot] updated from transifex
       new  ed06fc5   Add chunkSize config to documentation
       new  fe24ba5   [tx-robot] updated from transifex
       new  c84051c   [tx-robot] updated from transifex
       new  a6c2ccc   [tx-robot] updated from transifex
       new  37924b9   Win32: More complete resource specification
       new  3cc9019   ActivityWidget: Set timespec to UTC for JSON values.
       new  7f18d08   Utility: Make the timeAgoInWords method a bit more verbose
       new  e846b36   Tests: Add a test for the timeAgoInWords function
       new  667f2a7   [tx-robot] updated from transifex
       new  e3b56fb   Add file description, copyright to win32 VERSIONINFO struct
       new  2918e45   Add comment, transliterate copyright symbol
       new  cf47523   [tx-robot] updated from transifex
       new  841973d   Use correct values for items in version.rc
       new  a32381a   doc updates for 2.1.1 release
       new  bd72408   Merge pull request #4488 from owncloud/21-updates
       new  64ca8a6   [tx-robot] updated from transifex
       new  74f74e0   fix typo occured->occurred
       new  28b694b   Merge branch '2.1'
       new  5d7aa79   SyncEngine: Improve error message for ignored files/folders #4143
       new  99b3b75   Add theming options control sharing operations
       new  cf0762a   Lock the sharee input when sharing
       new  86fb832   Merge pull request #4470 from RealRancor/chunksize_config
       new  a76ba06   Merge pull request #4389 from Bottswana/deleteprompt
       new  b3d57f3   Cleanup syncengine after the new option not to ask confirmation when everything is removed
       new  8fe4f1f   Selective sync: Don't show negative size
       new  47ce4bd   SelectiveSync: Improve menu #4378
       new  fe76309   Propagator: Remove 100msec delay between jobs
       new  7e5d892   AccountManager: take theURL from the Theme rather than from the config if the theme specify it
       new  85f6c5f   Add note that branded clients have custom windows registry key names
       new  46c3c9e   fix formatting
       new  424bf6f   Merge pull request #4503 from owncloud/client-regkeys
       new  b685f6b   Chunking: change the default chunk size to 10MB
       new  60c101d   PropagatorDownload: fix possible crash
       new  c13637b   improve client build instructions
       new  744464a   [tx-robot] updated from transifex
       new  8222295   Merge pull request #4508 from owncloud/fix-crash
       new  1fafb13   Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"
       new  e6f81d3   Checksums: keep the transfer checksum in the database as the content checksum
       new  75c99bf   Fix TestXmlParse::testParser1
       new  b8dee63   Remove superfluous error checking from csync_create and csync_init
       new  b8227af   Move the csync_context creation in SyncEngine
       new  8ce9388   corrections to client building instructions
       new  e1909c3   add OBS link for client building
       new  0052386   correct OBS url for client building
       new  49f0049   Fix a crash when syncing
       new  6493421   Merge pull request #4509 from owncloud/build-client
       new  6aa418f   [tx-robot] updated from transifex
       new  3f46240   [tx-robot] updated from transifex
       new  a9b00a7   Don't make files read-only when server is too old #4450
       new  f24fa46   Merge pull request #4496 from owncloud/fix_4325
       new  8877f04   Merge pull request #4497 from owncloud/fix_4469
       new  10e8f03   Add 'pause all' tray menu entry #3829
       new  d521232   AccountState: Allow storing state in settings
       new  ba42d40   Disable sharing dialog if account state is not connected
       new  e4ec09d   Do not send reshare permissions when creating a federated share
       new  216956d   Merge pull request #4493 from owncloud/fix_4185
       new  b0db709   Merge pull request #4501 from owncloud/fix_4481
       new  17f40f7   [tx-robot] updated from transifex
       new  6e90191   Merge pull request #4527 from ckamm/account-pause
       new  40c1095   Improve folder pausing API
       new  f66c289   Add warnings for old server versions #4523
       new  ffa78b9   Merge pull request #4512 from owncloud/add-checksum-to-database
       new  7ed7512   Checksums: Content checksums for all uploads #4375
       new  d6d3502   Checksums: Compute content checksum on download #4375
       new  d78c367   Propagator: Pump in more requests if we think current ones are quick
       new  266508b   Merge pull request #4529 from owncloud/dynamic_parallelism_scaling
       new  4ff6dc2   [tx-robot] updated from transifex
       new  4f48c88   Don't use QVector::removeOne, added in Qt 5.4
       new  c554f53   Downloads: Preserve group ownership #4330
       new  7561f5c   Add comment and cleanup the csync exclude list code
       new  e91a5c8   Move the Logger reference back into src/gui
       new  5f24575   [tx-robot] updated from transifex
       new  50c32f4   [tx-robot] updated from transifex
       new  a441e4e   [tx-robot] updated from transifex
       new  25ce5f1   [tx-robot] updated from transifex
       new  debaff6   [tx-robot] updated from transifex
       new  9c5b9f9   Activities: Hide if non of the accounts has the app enabled.
       new  5461245   Merge pull request #4513 from owncloud/csyncContextToSyncEngine
       new  41d38b3   Add spinner to show we are creating the share
       new  3a608dd   [tx-robot] updated from transifex
       new  e41bb8a   [tx-robot] updated from transifex
       new  d484888   Merge pull request #4553 from owncloud/add_spinner
       new  b456ded   Show full path in warning message boxes before folder removal
       new  2843214   Merge pull request #4531 from ckamm/old-server
       new  17003ce   Settings: Hide update info if skipUpdateCheck #4397
       new  ad1c343   Merge pull request #4552 from owncloud/hide_activity_tab
       new  a14b495   Old servers: Don't nag if version still undetected #4523
       new  5cb45bf   Merge pull request #4549 from owncloud/fix_4545
       new  e82a138   [tx-robot] updated from transifex
       new  c062329   [tx-robot] updated from transifex
       new  0eb1041   AbstractNetworkJob: Add a delete job.
       new  a831b74   Added temporar icon for notifications.
       new  eb00b34   Minor wording fixes
       new  688c550   New GUI class NotificationWidget.
       new  32e16b3   Display server notifications on the client (#3733)
       new  4a4dac2   Notifications: Add a Progress indicator and handle job results.
       new  b97c832   Capabilities: Add isValid check and check for notifications
       new  7d13a1d   Notifications: Check capabilities if the notifications are enabled
       new  8a0ce46   Notifications: Properly delete the notification check job.
       new  6b8636f   [tx-robot] updated from transifex
       new  903e79a   Notifications: Do a GUI tray notification if new notifciations arrive.
       new  2d1ab27   Notifications: Refactor - create a notification handler class
       new  2c2a18a   Activitiy: Refactor - move classes to their own source files.
       new  adf9570   Notification: Enhance the tray message
       new  62d4ed8   Protocol: Show by default instead of server activity #4395
       new  6c07f08   Proxies: Enable ownBrander to force system proxy usage #4458
       new  22acc00   [tx-robot] updated from transifex
       new  39a95d3   [tx-robot] updated from transifex
       new  25baa99   Merge pull request #4532 from ckamm/content-checksum
       new  73cd5a9   Notifications: Cleaner notification string build
       new  97f1694   ActivityData: Simplified implementation.
       new  9d219a1   ActivityListModel: Code cleanups
       new  9a2f145   ocs jobs: Add a define for OCS job success.
       new  a4dcc27   Notification: Fix plural handling for tray message
       new  9460aa7   SyncEngine: Also emit item in other code path
       new  366abb5   [tx-robot] updated from transifex
       new  6e697ba   [tx-robot] updated from transifex
       new  9d5307d   Propagator: On remove move, take size from DB
       new  ecd44f7   Submodule: Use https path
       new  7bd4f95   SqlQuery: Write NULL when intended #4548
       new  4900703   SqlQuery: Write NULL when intended #4548
       new  04faee4   Doc: low disk space #4443
       new  97e323a   [tx-robot] updated from transifex
       new  45c32ec   NotificationWidget: Remove not needed method.
       new  f7f4120   Activity: Some documentation and better varialbe names
       new  254361c   Shared dialog: move the error label up (#4348)
       new  80b5f3f   Never overwrite the size from the db when updating the metadata
       new  3d157cb   User-Agent: put the actual version string in there
       new  4b19cde   Propfind: Treat broken XML response as failure #4575
       new  2bba68e   Handle server timezone data correctly #4521
       new  d7bd130   Ignores: expand escapes #4568
       new  6d8e570   [tx-robot] updated from transifex
       new  f71fdab   Fix timeAgoInWords
       new  05de710   Notifications: Display timestamp of the notification in the widget
       new  41b43bf   Utility: Make sure to use UTC timestamp to compare in timeAgoInWords
       new  f04895a   Utility: Fix plural translation.
       new  0a590b7   Notifications: Give feedback if notifcation request succeeded.
       new  15f6e13   sqlite: Update to version 3.11.1
       new  328d254   Notifications: Remove "done" notification widgets after fife seconds.
       new  7f22a07   Notifications: Check if the account is connected before querying.
       new  ceb4a23   Fix compile with strict C flags
       new  0febe9b   Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
       new  ff4cdc3   Quota: Change quota path if single folder #4460
       new  03db189   Fix wizardSelectiveSyncDefaultNothing #4581
       new  0e1b9a3   Fix plural translation handling, remove the superflous arg()
       new  6c51763   NSIS Silent mode: Force uninstall before install #4543
       new  cabeeba   Merge pull request #4582 from owncloud/nsis_uninstall_test
       new  b966345   Notifications: Refresh the notifications based on a config value.
       new  6735126   Fix crash due to destruction order
       new  c55ac50   Merge pull request #4584 from lultimouomo/fix-destruction-order
       new  476d628   [tx-robot] updated from transifex
       new  f02148e   [tx-robot] updated from transifex
       new  8c00d5e   [tx-robot] updated from transifex
       new  f587f35   Fix plural translation handling, remove the superflous arg()
       new  57acde7   Documentation: promptDeleteAllFiles #4389
       new  02a69d5   Exclude: Weird GoogleDrive "My Saved Places." file #4573
       new  d407aac   Notifications: remove notification widgets if the notification is gone.
       new  fb75adc   Wizard: Implement alternative forms of inquiring about the userID
       new  588646f   [tx-robot] updated from transifex
       new  d03fcc9   Notifications: Maintain a timeSinceLastCheck for every Account.
       new  ad60e8a   Notifications: Fix handling of notifications to remove from the list.
       new  f70c628   Notifications: Remove unused variable.
       new  ea2f19b   Docs: Add new config option for the notification sync interval.
       new  161d219   ActivityData: Add source file for implementation details
       new  1bb3a4a   NotificationWidget: Remove accountName() and add activity() method.
       new  0c944a0   NotificationWidgetUI: Fix sizing and sizePolicy
       new  1fe5d6b   Notifications: Handle Notifications without an action.
       new  05fae8e   Change note to warning in documentation
       new  84a6d1e   [tx-robot] updated from transifex
       new  2d24585   Implement enforcing a static URL postfix.
       new  7730e82   Merge pull request #4580 from owncloud/implement_ep_1136
       new  5989a07   [Win-shellex] Make sure to unregister obsolete CLSIDs #4595
       new  ecb34f6   [tx-robot] updated from transifex
       new  6867c2f   [tx-robot] updated from transifex
       new  68cbaf1   [tx-robot] updated from transifex
       new  d55c31d   [tx-robot] updated from transifex
       new  80bd86a   [tx-robot] updated from transifex
       new  df386b6   Make the AccountState a construction argument of the Folder
       new  2d2c7bc   Move the SyncEngine construction to the Folder constructor
       new  a4e0899   Remove the mutex from ExcludedFiles
       new  c090a51   Remove OwnCloud6 specific sharing code
       new  6d3fe9d   Remove the tainted folder logic
       new  6e16e34   Remove SocketApi::dbFileRecord_capi in favor of JournalDB::getFileRecord
       new  dac4bd8   Remove null-checks for FolderMan::_socketApi
       new  da7b991   Move the SocketApi business logic to a libsync SyncFileStatusTracker class
       new  ea5e6d3   Connect the SocketApi directly to the SyncFileStatusTracker
       new  69aa39f   Don's use SyncFileStatus for Folder::createGuiLog
       new  82190ea   Refactor the overlay icon logic to show errors as a warning for parent folders #3634
       new  ffbd5df   Account UI: Fix log out button text #4578
       new  4915bbf   Adjust size description strings #3403
       new  41f43fe   Add utility function for shorter time duration strings #3403
       new  10a7128   Update QTreeView tooltips as they change #3403
       new  c5fbde4   Folder info layout adjustments #3403
       new  98091ae   Theme: document forceSystemNetworkProxy (#4458)
       new  1730569   No Q_NULLPTR in Qt 4.8
       new  69e8e15   Remove explicit time spec specification as it is not needed.
       new  4d59f5e   ActivityData: Declare operators outside the class
       new  cacb751   Cleaups based on review feedback.
       new  9f438cb   Doc: Add milliseconds unit to notificationRefreshInterval doc
       new  2e30a0e   Remove superflous iterator increment
       new  cd3f612   ActivityWidget: Rename blacklistActivities to blacklistNotifications.
       new  47a552f   Use a std::map for SyncFileStatusTracker problems
       new  fbf23b6   Cleanup after the SyncFileStatusTracker change
       new  ef57d4a   Move the SyncFileStatusTracker directory slash suffix logic in a method
       new  8166c52   NotificationHandling: Use QByteArray for the verb.
       new  885f8b3   ActivityWidget: Handle plural properly in translations.
       new  127291e   [tx-robot] updated from transifex
       new  5636dc1   Tooltip updater: Fix compile with Qt4
       new  98995f4   Merge pull request #4618 from ckamm/progressui
       new  56064c9   Fix sibbling directories showing up as warning
       new  2c0caf8   Fix the SocketApi status of CSYNC_FILE_SILENTLY_EXCLUDED files
       new  a0260c2   Fix the build on Windows
       new  cdbc25e   Merge pull request #4615 from owncloud/socketApiRefactor
       new  c35e74d   Theme: Enable link sharing by default
       new  c150350   SyncFileStatusTracker: Fix compilation with older Qt
       new  6c283c7   OS X: Use app icon for "Share with ..." Finder menu #4472
       new  dd8b0c3   Merge pull request #4623 from owncloud/share_menu_icon_osx
       new  f427955   Simplify the build of auto tests
       new  17c645c   Hide environment variables when running the FinderSync icns script
       new  9ea191f   Scale correctly with HiDPI displays on Linux with Qt 5.6
       new  a115f4b   Merge pull request #4625 from owncloud/trivialFixes
       new  d65808b   [tx-robot] updated from transifex
       new  e058193   Fix invalid read on account removal
       new  fa1bb30   Graceful termination of folderwatcher_win #4620
       new  87e4370   [tx-robot] updated from transifex
       new  84ad0d2   [tx-robot] updated from transifex
       new  8b3ea7a   [tx-robot] updated from transifex
       new  6b0d535   Merge branch 'notifications'
       new  434d169   SyncEngine: fixed restoring files when they are moved in a new directory
       new  bc6eebd   NotificationWidget: Handle empty message and subject properly.
       new  73e2a50   NotificationWidget: Some ui refinements.
       new  3334067   Merge branch '2.1'
       new  f495daf   [tx-robot] updated from transifex
       new  65e7403   [tx-robot] updated from transifex
       new  7994b3d   ProtocolWidget: handle Conflicts as not-synced items
       new  5b40921   ProtocolWidget: Show number of non synced files in tab label.
       new  efb0faa   Folder: After sync, fire up tray notification if conflicts happened.
       new  252aea2   ProgressDispatcher: Improve wording about conflicts.
       new  9bdc84c   NotificationJobs: Set ocs header to maintain the session.
       new  15bdb7b   [tx-robot] updated from transifex
       new  4e17dab   Folder: Fixed a couple of plural translation issues.
       new  52a5234   Merge pull request #4641 from owncloud/bubbleUpConflicts
       new  7b1f02f   SelectiveSync: Verify if the list could be read from journal.
       new  e4604b4   SyncEngine: finalize properly on error with syncjournal
       new  058cd33   Not Synced: Display only the number of not synced items in parathesis.
       new  a0827c5   Remove deleted icons from resource file
       new  271bea3   Update binary subdir
       new  4dd8d61   [tx-robot] updated from transifex
       new  4243949   Merge pull request #4645 from owncloud/fix_4633
       new  48bfcde   Merge pull request #4640 from owncloud/numberInProtocolTab
       new  8f7b833   Not Synced Tab: Use tr rather than string concat
       new  c64720e   Merge pull request #4605 from RealRancor/RealRancor-patch-1
       new  329f512   [tx-robot] updated from transifex
       new  f1732d6   [tx-robot] updated from transifex
       new  4ce9763   Merge pull request #4630 from ckamm/folderwatchwin
       new  4b5c9c5   [tx-robot] updated from transifex
       new  a0baca2   [tx-robot] updated from transifex
       new  74a75f6   [tx-robot] updated from transifex
       new  ee58cc3   SyncEngine: Close the sync journal after the sync run has finished.
       new  648328f   SyncJournalDb: Close the db on error in getFileRecord()
       new  6ee7e82   Handle setFileRecord errors #4632
       new  bd3a079   Merge pull request #4648 from owncloud/handle-database-errors
       new  2ec642a   ActivityWidget: Properly set widget for the Scrollview.
       new  e896d16   ActivityWidget: Make sure Notification are visible if Activity disabled
       new  f8dc263   CMakeLists: fix Qt4 build
       new  976f4df   ActivityWidget: Fix Qt4 build
       new  c48b5c4   ActivityWidget: use a QHash for  _widgetsToRemove
       new  d433c24   Check if the record returned from getFileRecord is valid.
       new  6cb94e8   Merge pull request #4656 from owncloud/close_journal_fix
       new  d5f1d1c   SqlQuery: Add method errorId() to get the numeric error code.
       new  aaf43bd   SyncJournalDb: Handle empty filename and avoid a bogus db query.
       new  868edb1   SyncJournalDb: Only close the db if the return code is not SQLITE_DONE
       new  2d08754   [tx-robot] updated from transifex
       new  41b950b   Don't call reset() on a query after close() #4662
       new  68b7437   Merge pull request #4658 from owncloud/fix-qt4-build
       new  6f454fe   Fix hidden file handling #4655
       new  4f79f1b   Explicitly depend on Qt5Test.
       new  844777d   Fix unit test build
       new  bf99306   Merge branch 'do_not_close_db_on_done'
       new  fdcdddc   CMakeLists: move QtKeychain detection in client
       new  f443377   Merge pull request #4664 from ckamm/hiddenfiles
       new  15988c6   SocketAPI: Use NOP only, not NONE in the share api protocol.
       new  a4f606c   [tx-robot] updated from transifex
       new  ed3203d   Merge pull request #4659 from owncloud/fix_client_4651
       new  9cc981c   Make postfixlineedit more userfriendly, rename email id string to "Email".
       new  f7aafb0   Dolphin Plugin: rename the files to the branded name #4669 (#4672)
       new  97a6d3d   document Theme::wizardUrlHint()
       new  8155c1c   [tx-robot] updated from transifex
       new  910c61b   Disable unavailable sharing permissions #4383
       new  48e594e   Merge pull request #4673 from ckamm/shareperm
       new  8d300b0   ShareDialog: Tell a user early if resharing is impossible #4679
       new  484a2c8   Fix typo
       new  dfd7d4d   Activity tab visibility fixes #4651
       new  8eb53fa   nautilus integration: Handle NOP as empty.
       new  12330b3   Folderman: Remove one call to updateFolderView.
       new  8007331   SocketAPI: Remove unneeded logging.
       new  a0521ca   CSync: Allow files with 0 mtime #1603
       new  bc6c57a   Exclude: .Trash-* trash folders #4600
       new  700c7bc   [tx-robot] updated from transifex
       new  053dcbf   Merge pull request #4686 from owncloud/allow_0_mtime_files
       new  74301e4   The share-permissions namespace was moved
       new  4ad8e04   Merge pull request #4684 from owncloud/less_socket_api_updates
       new  e262231   Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt
       new  ea40e31   Add server capabilities for checksums #4638
       new  d1649ce   OS X: Allow ampersand in APPLICATION_NAME #4657
       new  06c19b0   sqlite: Update to version 3.12.1
       new  fafca26   AccountManager: take theURL from the Theme rather than from the config if the theme specify it (#4591)
       new  c4577cb   Merge pull request #4683 from owncloud/fix4657
       new  0f3d6d4   SyncFileStatusTracker: Add a method to handle the root item.
       new  6a9655a   OS X: Fix overlay installation on El Capitan #4650
       new  df0833d   [tx-robot] updated from transifex
       new  c0ec481   No need for WebKitWidgets in libsync anymore
       new  6a36d1b   [tx-robot] updated from transifex
       new  93ad61a   [tx-robot] updated from transifex
       new  11d3aa3   Protocolwidget: Removed some leftovers from refactoring.
       new  2ab4caf   ProtocolWidget: Display the recalculated number of issues.
       new  9f30e83   Merge pull request #4687 from owncloud/fix_share-permissions-namespace
       new  038b7db   [tx-robot] updated from transifex
       new  5989419   Use expireDate if returned by the OCS Share API
       new  33459b4   Merge pull request #4700 from owncloud/fix_4409
       new  a17f37d   Discovery: Be more explicit about files with unknown size #4573
       new  edb942b   Merge pull request #4696 from owncloud/issue4573_negative_content_length
       new  bd37eab   SocketAPI: Display a warning on the directory if there are errors
       new  c379593   Doc: Draft overlay icons
       new  53a7214   a bit of editing on new section
       new  a3a9417   [tx-robot] updated from transifex
       new  1a51b67   UI: Remove alias from more places #4577 #4695
       new  f9fb7a5   Merge pull request #4708 from owncloud/aliasGui
       new  add29be   Nautilus plugin: Remove the bogus logging
       new  f72c7f4   Nautilus plugin: Be more robust against new states from socketapi
       new  b56919d   SocketAPI: Return NOP state if folder is diconnected or paused.
       new  1935c78   [tx-robot] updated from transifex
       new  fa69d08   Checksums: remove the downloadChecksumValidationEnabled option
       new  522f7af   Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
       new  dbcb94e   Update doc and Dockerfile for 2.2 builds
       new  e29d7e0   Use QTokenizer to properly parse netrc
       new  8b39c6e   Merge pull request #4709 from owncloud/fix_4691
       new  7a82fac   owncloudcmd: Save the selective sync list on the first run
       new  361ebf5   SyncFileStatusTracker: Remember the state of new files.
       new  7acdf50   SocketAPI: Code simplifications as asked for in the review.
       new  e5a5b95   Merge pull request #4689 from owncloud/overlays_handle_root
       new  055c2ef   local_vio_win: Fix handling files that have been deduplicated
       new  6ba7c6e   Windows VIO: Remove unused variable.
       new  277a1cf   [tx-robot] updated from transifex
       new  b61ae35   Merge pull request #4713 from owncloud/fix_win-sis
       new  57f0603   Doc: Applied review feedback for overlay icon docs.
       new  84ac2e6   Quota: Add branding option for the base folder (#4714)
       new  0711abb   Theme: missing virtual keyword
       new  f8f394e   Adding new resource for the desktop.ini file
       new  665c3f4   Fix search & replace error in Dockerfile
       new  19eca84   Merge pull request #4715 from owncloud/translate-desktop-ini
       new  8694db1   [tx-robot] updated from transifex
       new  d3a9332   Only 1 : between namespace and property
       new  7d285d0   Merge pull request #4717 from owncloud/fix_webdav_property
       new  030184f   Merge pull request #4704 from owncloud/doc_overlay_icons
       new  41eb5f0   [tx-robot] updated from transifex
       new  335e333   [tx-robot] updated from transifex
       new  64b6486   [tx-robot] updated from transifex
       new  31f2c3e   [tx-robot] updated from transifex
       new  4e7c09d   QTokenizer: fix Qt4 build
       new  12bf6e3   Share link: Consistent order of options owncloud/core#24122
       new  b4cf17d   Overlay icons: Fix duplicate icons in nautilus #3249
       new  f657bd0   Overlay icons: Fix invalidation with nautilus #3249
       new  043350f   Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate
       new  09eea7f   Checksums: Use the first supported type if nothing is preferred
       new  ce6a365   Disambiguate socket API pathes on Windows with user name
       new  ce5ca8a   UI: Fix account name/alias display oddities #4577
       new  85bc3b2   Merge pull request #4744 from owncloud/fixAliasesOnceMore2
       new  cd29875   Folder: Generate an alias for new folders
       new  4ea2edc   Merge pull request #4741 from owncloud/fix-alias
       new  faf2514   [tx-robot] updated from transifex
       new  0829a94   Remote folder selection: improve path typing #4745 #4746
       new  07bdd51   vio for windows: Use more graceful create file params.
       new  0da2adc   Workaround ubuntu 16.04 systemtray bug (#4693) (#4747)
       new  d0af3ed   AccountSettings: context menu: don't rely on the alias
       new  051a348   Vio for windows: Removed the overlap param again.
       new  f7c6efb   ConnectionValidator: Also set short timeout for capabilities job
       new  f7082ee   sqlite: Update to version 3.12.2
       new  c2fa3fb   Overlay icons: Track touched files #4730
       new  38bad56   Merge pull request #4739 from ckamm/trackdirty
       new  af5f2d3   Protocol: Make timestamp column width fit the text #4721
       new  6a51ae5   [tx-robot] updated from transifex
       new  074f8ea   Selective sync: Sort folders in FolderStatusModel #4612
       new  a36b4ec   FolderWizard: Sort remote folders #4612
       new  e7f0033   Fix perl tests #4722
       new  68126dc   Checksums: Skip uploads of .eml files only #4754
       new  6814342   Merge pull request #4748 from owncloud/win_stat_revisited
       new  e70b78d   Merge pull request #4738 from owncloud/fix_3411
       new  b43a942   Revert "Disambiguate socket API pathes on Windows with user name"
       new  6d83e84   Merge pull request #4756 from owncloud/revert-4738-fix_3411
       new  2993200   Shibboleth: Load username from config for UI (#4751)
       new  817e97c   [tx-robot] updated from transifex
       new  11b1449   PropagateDownload: Throw an error if the file is empty while it should not have been (#4753)
       new  be466b4   Merge remote-tracking branch 'origin/2.1' into 2.2
       new  31c13f7   Add spinner during sharee search (#4764)
       new  e6b937f   LockWatcher: Keep an eye on Windows file locks (#4758)
       new  4974819   [tx-robot] updated from transifex
       new  52f9f44   [tx-robot] updated from transifex
       new  c91dd94   [tx-robot] updated from transifex
       new  3047682   ShareDialog: show the error message in red
       new  e833d01   Re-Apply: Disambiguate socket API pathes on Windows with user name
       new  a671736   Propagator: fix qt4 build
       new  d340017   [tx-robot] updated from transifex
       new  641125e   Fix nautilus and nemo plugin branding strings. (#4780)
       new  a5df44c   Fix the sync status push for parent directories #4682
       new  32b3023   Fix the root item sync status #4682
       new  7bfe469   Simplify the root status logic
       new  7c2fdee   Avoid a SyncFileStatusTracker private overload with the same name
       new  e58739d   [osx] Fix missing overlay icons on client startup
       new  064c2b6   Merge branch 'overlayIconFixes' into 2.2 (#4765)
       new  7110091   Qt patches: Update with information about Qt 5.6
       new  928643f   NSIS: Properly uninstall both x64 and x86 DLLs #4762
       new  15dc340   [tx-robot] updated from transifex
       new  3d9d106   Dolphin plugin: fix build with branding
       new  d7804d8   [tx-robot] updated from transifex
       new  727e73d   [shell/windows] Fix the windows status push not working (#4784)
       new  fd96b48   [tx-robot] updated from transifex
       new  74f67c9   [tx-robot] updated from transifex
       new  8820bc1   Windows: Fix Share menu #4781
       new  0e9170c   Windows Shell Integration: Unify path lookups
       new  d659c54   Update binary sub module
       new  9d6701e   Windows Shell Integration: Fix another spot where the pipe path was constructed manually
       new  58ad781   Update binary submodule
       new  9c0cd2b   Added Changelog for 2.2.0
       new  9e7a8e6   Fix utility test: Pass a command name to do the version check.
       new  9b1f46e   Fix exclude unit test, adopt to new Iface of isExcluded.
       new  0350589   Documentation draft to introduce notifications.
       new  edc58c0   Fix assert on restore after propagation (#4823)
       new  7b0231b   Merge pull request #4821 from owncloud/notification_doc
       new  9290ed6   2.2.0 final
       new  49a678a   timeAgo test: Fix for qt4, clean up

The 465 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