[Pkg-owncloud-commits] [owncloud-client] branch jessie-backports updated (c943324 -> d1a8bd3)

Gaudenz Steinlin gaudenz at moszumanska.debian.org
Tue Mar 8 17:30:11 UTC 2016


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

gaudenz pushed a change to branch jessie-backports
in repository owncloud-client.

      from  c943324   Update changelog for version 2.0.2+dfsg-1~bpo8+1
      adds  a87602a   use SHAREDIR for i18n
      adds  62d64ac   Merge pull request #3589 from owncloud/sharedir
      adds  c6ff73f   checking if file or folder is to be shared to fix issue #3556
      adds  22d8721   Merge pull request #3601 from individual-it/master
      adds  bc37668   1st batch of updates for 2.0
      adds  9f24f10   Update installing.rst
      adds  cf543d1   Update navigating.rst
      adds  45835f1   Update navigating.rst
      adds  ccfcdff   Merge pull request #3665 from owncloud/2-0updates
      adds  950bc57   Merge branch '2.0'
      adds  3ba5e27   Merge branch '2.0'
      adds  bcfc16c   Add a sign in button in the settings window
      adds  628957d   Remove the _readPwdFromDeprecatedPlace codepath
      adds  dcb6879   Show a notification instead of a login window on startup #3350
      adds  94a57fe   Get rid of ShibbolethRefresher
      adds  89f6920   Simplify the authentication code paths #3350
      adds  6d027eb   Separate the credential dialog from their fetch #3350
      adds  128d46e   Remove *Credentials::_fetchJobInProgress
      adds  39bff05   Merge remote-tracking branch 'origin/2.0'
      adds  21dbf97   Merge remote-tracking branch 'origin/2.0'
      adds  cc5f8e5   fix unicode issue #3753
      adds  63636ac   Merge pull request #3777 from owncloud/individual-it-utf8-patch
      adds  fdfab07   Coin the term 'folder sync connection'
      adds  d823809   Merge pull request #3781 from phil-davis/FSC
      adds  79f64ab   /doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
      adds  0329a8b    /doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
      adds  b706161   Merge pull request #3789 from hh-lohmann/Terminology
      adds  1cb518c   Fix registry key syntax in FAQ.
      adds  a08a90a   Merge pull request #3892 from RealRancor/fix_faq
      adds  20ea901   Propagation: Make 423 Locked a soft error #3387
      adds  12dc372   Sync: An initial diskspace check #2939
      adds  36e8e9e   Propagator: Download disk space checks #2939
      adds  24c41ed   Propagation: Try another sync on 423 Locked #3387
      adds  3812fd0   Checksums: Prepare 'supported checksums' capability #3735
      adds  1383023   Fix the Qt4 build.
      adds  cf9e5ff   Remove dead code
      adds  9f8d109   Network errors: Use exception name, if message is empty #2718
      adds  efefc2d   Merge branch '2.0'
      adds  95fc792   Tray: Change texts #3657
      adds  7d18866   FolderWatcher: Use csync exclude code #3805
      adds  d610693   SelectiveSync: Apply excludes #3876
      adds  8fd2b8d   Fix linkname in architecture.rst.
      adds  b09f1d5   Merge pull request #3916 from RealRancor/fix_rst_syntax
      adds  b8ccbbc   GUI comment and message typos for master
      adds  f5daf50   Merge pull request #3920 from phil-davis/guitypos
      adds  f0e17fd   libtypos comment and message typos for master
      adds  6d6903e   Merge pull request #3919 from phil-davis/libsynctypos
      adds  a7cf1b0   Simplify creating the library path
      adds  cb3a301   Merge pull request #3899 from sebasje/sebas/cmake
      adds  c1ba927   Propagatorjobs: Removed superflous semicolon.
      adds  74a7755   SocketAPI: String concat optimization as learned on QtWS.
      adds  419d18c   FileSystem: Reuse the FileInfo object that is created in the caller.
      adds  7fe03c7   SelectiveSync: Don't adjust removed path
      adds  51a2e6c   Exclusion: Fix confusion with relative and absolute paths
      adds  225da68   ExcludedFiles: Add test
      adds  efdb29d   AccountSettings: Show disabled 'Add Folder' tooltip on click #3645
      adds  4a7242c   Extended capabilities API
      adds  028dc8d   Add SHARE_STATUS socketAPI command
      adds  a752ead   Merge pull request #3923 from owncloud/check_shareapi_available
      adds  05eee16   SelectiveSync: Show in-progress label #3524
      adds  05471d0   Also parse capabilitie for public uploads
      adds  2fdae6d   Allow setting op public upload on link shares
      adds  df2418d   Merge pull request #3661 from rullzer/public_upload
      adds  abd6303   ETag: Allow parsing of weak tags #3946
      adds  67e9a06   Progress estimation: Adjust low-transfer detection #3942
      adds  6e09e3a   Fix test compile
      adds  c418d67   Merge remote-tracking branch 'origin/2.0'
      adds  963eb1f   VERSION.cmake: master is 2.1
      adds  c3754e1   folderstatusmodel.h: Fix warning
      adds  132b5f5   Account Settings: Expand selective sync on show #3585
      adds  027a865   Account Settings: Show selective sync buttons after list load
      adds  b5e75af   General settings: Align checkbox #3758
      adds  df135a0   Merge branch '2.0'
      adds  5cac90b   SelectiveSyncTreeView: show the size for the root item (#3755)
      adds  a159dfc   Dolphin shell integration:  Make it work with dolphin master
      adds  cac219a   Dolphin shell integration: Add a Share with owncloud action
      adds  731d4b3   Dolphin shell extention: adapt to the change in KDE Frameworks
      adds  82d1d04   Dolphin shell integration: share code between two plugins
      adds  184412d   Dolphin shell integration: Renames the plugins
      adds  f8e68ae   Merge branch 'dolphin-plugin'
      adds  5408ec7   Dolphin shell extention: Remove the KDE4 based plugin
      adds  c520ee4   Dolphin Shell Extension: renamove the kf5 in the name
      adds  6ea05ff   Dolphin shell integration: use the owncloud icons
      adds  ccec186   ETagJob: Depth 0 for server >= 8.1 #3730
      adds  00485e1   VERSION.cmake: This is git not rc1
      adds  671af9f   Merge branch 'master'
      adds  c80b033   VERSION.cmake: fixup
      adds  67910e7   Discovery: Call it "Checking for changes in" in UI
      adds  374f29c   Account Settings: Fix crash for acocunts withour folder
      adds  ee69ab2   Account Settings: Don't disable double click expanding for sub folders
      adds  23b5a74   Account Settings: Don't expand while clicking on the '...' button
      adds  4369e31   Folder Model: don't try to fetch data if the account is disconnected
      adds  557b704   Fix compilation warning
      adds  0b6d21e   Logger: don't call qFormatLog when unessesary
      adds  407ff0a   Theme: cache the QIcon::fromTheme
      adds  674b6f2   Account Settings: clear the focus of the "Sign In" button when clicked
      adds  98b966d   OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
      adds  de5de7a   csync_exclude: Optimize
      adds  7182754   csync_exclude: Use PathMatchSpecA instead of PathMatchSpecW
      adds  8ff3055   sync-exclude.lst: Remove entries that are hardcoded anyway
      adds  f739d8f   sqlite: Update to version 3.9.1
      adds  9c38878   csync_update: Don't fetch the etag in the local discovery from the DB
      adds  597d36d   csync_statedb: Use the index in csync_statedb_get_below_path
      adds  cf24287   SyncEngine: keep a static pointer to the codec
      adds  b293aa7   Split sharing code
      adds  3ea944d   Added setPublicUpload to OcsShareJob
      adds  db1f4d4   OCSJob -> OcsJob and more docs
      adds  a34b663   Now add parameters in a less crappy way
      adds  4441053   Thumbnailjob fixes
      adds  0371933   Remove unused members
      adds  f95fea9   Move permissions to OcsShareJob
      adds  40ab3ee   Now only 1 constructor to ocssharejob
      adds  0e97fbb   Use overloaded functions
      adds  4a04dc1   Typos
      adds  ec351e0   Merge pull request #3773 from owncloud/split_sharedialog
      adds  c80e72d   Sharing: change coding style of enum
      adds  daf6d87   update 3-dot menu
      adds  c8ae54d   Merge pull request #3982 from owncloud/20-update
      adds  c7bf09c   Merge remote-tracking branch 'origin/2.0'
      adds  f6a543a   Logger: speedup the sync discovery when the log is innactive
      adds  a608b4e   Folder: set csync verbosity to 0 if the Logger is not there
      adds  455c3ae   test/CMakeLists.txt: remove comments
      adds  91525a7   csync_exclude: Don't ignore invalid char client side (#3736)
      adds  899f52b   Revert "Settings dialog: remove the close button #3713"
      adds  f18b40f   csync_vio: reuse the information from readdir in stat
      adds  d657c00   FolderStatusModel: fix getting the size of the folder in the selective sync (#3986)
      adds  42a6b24   SettingsDialog: use QWidgetAction for the toolbar so the extension works
      adds  bd39c64   Delete all files: make the 'Keep' on by default
      adds  c93defc   SyncEngine: remove unused functions
      adds  84f1bdb   Folder::wipe:  We need to shut the socket API down before removing the DB
      adds  39289a3   SocketAPI: don't trim the command #3297
      adds  dccf4e9   Download: Soft errors for error while resuming (#4000)
      adds  3c93fd4   AccountSettings:  don't disable pause when offline (#4010)
      adds  fac0034   Use the term folder sync connection in more places  #3757
      adds  3f2a2cb   FolderDelegate: put the progressbar in place of the remote or local folder  #3403 #3569
      adds  84a04de   Settings Dialog: don't put padding on the toolbar extension
      adds  26e1223   FolderStatusModel:  reset also if a folder was renamed  #4011
      adds  30a0423   Dolphin integration: fix error icons
      adds  05dd955   SocketApi: Fix returning ignore for the root item all the time
      adds  e86b420   IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
      adds  46558d7   Add slot to handle clicks on folder names.
      adds  81f0c65   Enable external links in the label.
      adds  40c82c5   AccountSettings: Add index to undecided folder to be able to select it.
      adds  1c1ef52   AccountSettings: Display a link for undecided dirs in the sub text.
      adds  a203da3   FolderStatusModel: Check for null argument at start.
      adds  89f2a9e   Account Settings: A link should make sure all the parents are expanded
      adds  f1d48a9   Folder Model: The item needs to be selectable for the currenIndex to appear selected
      adds  b5390b5   [tx-robot] updated from transifex
      adds  6b71273   Discovery: Fix detection of hidden files.
      adds  0c9568f   Merge pull request #4004 from owncloud/fix_hidden_detection
      adds  d2e5ba1   Fix compile after pull request merge
      adds  7c5e70a   PropagateUpload: Fix double-emission of finished #3844
      adds  c81b02c   csync tests: Remove unused function
      adds  c8590c4   Remove legacy propagator and neon
      adds  6a06330   Network Settings: Adjust the bandwidth limit option with old Qt
      adds  9337927   legacy propagator: Remove more code
      adds  a6c9e8c   Merge branch 'kill_legacy_propagator'
      adds  d91ffc2   Exclude: Add .fuse_hidden #3999
      adds  b6aa18b   sync-exclude.lst: More likely matching files first
      adds  6d28a1b   Fix Qt4 compilation
      adds  c97dfbf   ChangeLog: Mention propagator removal
      adds  4737c16   State application name in update notification
      adds  9788055   Propagator: Add blacklisting of disk space errors #2939
      adds  64756c5   --version also shows Qt version
      adds  c11c35c   Revert "In case of empty checksum type, emit validated."
      adds  0354289   Checksums: Improvement in async computation and validation #3735
      adds  60b2312   SyncJournal: Add checksumHeader column to metadata table #3735
      adds  b1387f8   Propagate: On download store checksum header in db #3735
      adds  dff37e1   Propagate: Store computed checksums in db during upload #3735
      adds  f1b500d   Checksum: Add env variables to disable #3735
      adds  b9fc4c5   Checksum: Fix recomputation when forced in cfg file #3735
      adds  5ea09d2   Checksum: Disallow ADLER32, use Adler32 #3735
      adds  b7823dc   Checksum: Put checksum type into separate column #3735
      adds  5661312   Checksum: Fixes after review
      adds  496b1e9   Checksum: Don't lose it on metadata update #3735
      adds  2516792   Merge pull request #3951 from ckamm/checksum
      adds  d9f8edd   Hidden files: Consider .* hidden everywhere #4023
      adds  0fde7f0   Propagator: Keep a meaningfull error with old server and invalid file names
      adds  6fae06f   [tx-robot] updated from transifex
      adds  6d87bd1   Make returncode 0 for --version and --help
      adds  e5570c2   Merge pull request #3995 from owncloud/return-code-of-version-and-help
      adds  c3fc711   [tx-robot] updated from transifex
      adds  6611d87   [tx-robot] updated from transifex
      adds  2eb5715   ChangeLog 2.0.2 minor typos for 2.0 branch
      adds  3ff7fa0   Merge pull request #3997 from owncloud/phil-davis-patch-1
      adds  4d7fde5   [tx-robot] updated from transifex
      adds  6aa2665   Merge remote-tracking branch 'origin/2.0'
      adds  a127deb   Quota: handle special negative value for the quota #3940
      adds  726be08   Revert "Config: Use monochrome icons per default on MacOSX."
      adds  ee65315   Merge branch '2.0.2' into 2.0
      adds  bc5890d   Add version suffix git.
      adds  46269da   Merge branch '2.0'
      adds  38a8e5e   Discovery: conding style: use const references for function parameters
      adds  c3cf6ae   SyncEngine:  Don't whipe the white list if the sync was aborted
      adds  ced5181   ChangeLog typos that reverted in merge from 2.0
      adds  29558cb   Merge pull request #4040 from owncloud/phil-davis-changelog-master
      adds  918c06a   Add share manager and the share objects
      adds  390daed   Added getPublicUpload to LinkShare
      adds  239603e   Make sure enforced passwords are properly respected
      adds  30a3498   Fix typos
      adds  cf8be7d   Proper const usage
      adds  b32f752   Properly cleanup OCS jobs
      adds  6d80f3d   Proper foreach
      adds  12f7cfd   Shares do not have parents
      adds  8c0297f   Use QLatin1Char
      adds  dd8d02b   Act properly if OCS endpoint returned an error (OCS error)
      adds  c7b8143   Use proper QFlags
      adds  d38b190   Merge pull request #4033 from owncloud/share_object
      adds  0e6a463   Discovery: Don't leak DiscoveryDirectoryResult in case of error
      adds  49cd53e   FolderStatusModel: attempt to detect removed undecided files #3612
      adds  0c467ef   Sync engine: fix signal/slot connection
      adds  16c0789   owncloudcmd: add --max-sync-retries  #4037
      adds  aaf16ff   SyncJournalDB, clear all the queries before closing the database
      adds  3993a7f   OwnSQL: add asserts in case of error that should not happen
      adds  aa1a2d1   Reviewing, improved style, and a initializing message
      adds  43800e3   Merge pull request #4049 from Naereen/patch-1
      adds  d2cd237   [tx-robot] updated from transifex
      adds  3f85694   [tx-robot] updated from transifex
      adds  89734b9   [tx-robot] updated from transifex
      adds  03cc67a   [tx-robot] updated from transifex
      adds  b82ffb5   Merge remote-tracking branch 'origin/2.0'
      adds  448d8bf   [tx-robot] updated from transifex
      adds  f816e5e   [tx-robot] updated from transifex
      adds  3ee8beb   Exclude: Add .nfs*
      adds  8c5ef2f   Make registry key a code block in autoupdate docs.
      adds  d2a6cae   Merge pull request #4052 from RealRancor/fix_autoupdate
      adds  5fccc25   Fix Qt4 build
      adds  517f2ed   Add coverity badge
      adds  6052e49   [tx-robot] updated from transifex
      adds  dae724b   QtVersionAbstraction: Quick not neeed on OS X
      adds  0070835   macdeployqt: Hack to make Qt 5.5 work
      adds  6901fc9   macdeployqt: Also copy bearer plugins
      adds  5e482ad   [tx-robot] updated from transifex
      adds  37098c9   [Sharing] Add setpermission to sharing code
      adds  309be57   [Sharing] Add user/group sharing dialog
      adds  6fb4e59   [Sharing] First step towards proper group sharing
      adds  90cbd46   [Sharing] Allow sharing with users/groups from desktop
      adds  3e4612a   [Sharing] Reorganized sharedialog code
      adds  20fd349   [Sharing] Filter sharee list properly
      adds  806ec98   [Sharing] Properly delete widget
      adds  4cf2422   [Sharing] Clear completer on activation
      adds  6431a2a   [Sharing] Build sharee list on every search
      adds  914a942   Merge pull request #4055 from owncloud/user_group_sharing
      adds  0163839   OS X: Fix toolbar oddity #3719
      adds  1a1541e   macdeployqt: Forgot comma
      adds  4784b32   Folder Status: Use same fat ... icon as web
      adds  d9af837   [tx-robot] updated from transifex
      adds  ac3f179   [tx-robot] updated from transifex
      adds  b0dc264   [tx-robot] updated from transifex
      adds  81e3a62   Account: Show local path in tooltip
      adds  aa27b5d   Discovery: silent static analysis warning
      adds  b74e812   Share dialog: a few layout adjustements
      adds  b29d1e9   ShareDialog: fix autocompletion took the wrong user
      adds  b552209   [tx-robot] updated from transifex
      adds  5189690   Silence warning by removing extra semicolon
      adds  175ad6f   Reflect read-only permissions in filesystem #3244
      adds  76d9b9c   Rename env variables to include unit #2939
      adds  9955b07   Settings: Show first account page on startup #4036
      adds  4b5c3d8   Tray: Show settings dialog on click if it's not active
      adds  8f7dbe7   CleanupPollsJobs: Preserve more journal data
      adds  17dd199   Checksums: Treat more carefully in db #4034
      adds  bd65eb3   SetupWizard: populate credentials from HTTP server URL
      adds  15fe3b5   Merge pull request #4100 from mnutt/credentials-from-url
      adds  f753960   [tx-robot] updated from transifex
      adds  1d9c591   Fix OS X compilation: use mode_t instead of __mode_t
      adds  25c177c   SyncJournalFileRecord: Remove unused mode field
      adds  beb9706   Fix csync_exclude test
      adds  eb3388d   Fix OwnSql test
      adds  01aa647   FolderMan: Fix infinite wait on pause #4093
      adds  2ccb364   Recent Activity: Filter metadata updates #3963
      adds  3224a95   Forward-declare QModelIndex. Fixes Qt4 builds.
      adds  e50cfa4   Recent Activity: Don't reset for no reason #3889
      adds  196ee05   Share dialog: Initialize expected expire date #4075
      adds  05d1cc9   Sharing: Fix crash with share deletion #4111
      adds  c871d72   Tray tooltip: Use aliasGui #4096
      adds  fd4a510   NSIS: Include Qt bearer management DLLs #3969
      adds  c465475   sync excludes: Add .directory files to be ignored
      adds  bac69f9   [tx-robot] updated from transifex
      adds  3d847b5   [tx-robot] updated from transifex
      adds  e1ab50b   [tx-robot] updated from transifex
      adds  f4bfce1   [tx-robot] updated from transifex
      adds  d423cf2   [Sharedialog] Fix UI stuff
      adds  72d119a   [Sharing] Delete animation when share is removed
      adds  786b602   Merge pull request #4133 from owncloud/sharedialog_uit_improvements
      adds  0d21503   ShareDialog: fix auto completion to actualy auto complete
      adds  7e4c0bd   AccountSettings: Add a toolbox button for the account specific actions.
      adds  becbb7b   AccountSettings: Address jans suggestions  in #4139
      adds  74ed0b4   Merge pull request #4139 from owncloud/account_toolbox
      adds  0c14802   SyncLog Dialog WIP
      adds  afd081f   Settings: Move synclog widget to a seperate dialog.
      adds  a8eb913   SyncLogDialog: Do not delete SyncLogDialog after close.
      adds  4ad165c   Utility: add method fileNameForGuiUse(), pimp up filename for GUI
      adds  c66c259   SettingsDialog: Add new widet called ActivityWidget.
      adds  9279bcd   Add a tabwidget to Settings dialog for activity.
      adds  302d6b3   ActivityWidget: Add a job to fetch activities, Activity object added
      adds  3b8e1dc   SettingsDialog: Make ActivityWidget a member.
      adds  4895683   ActivityWidget: Do a proper asynchronous model to display the activity.
      adds  3fb43d2   ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
      adds  060f4f2   SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
      adds  6c6ee35   ActivityListModel: Check if the account is connected when fetching more.
      adds  9545af0   JSONApiJob: Add method to add additional query parameter.
      adds  71849c4   ActivityListModel: Add the page and pagesize parameter to ocs query.
      adds  b600ac8   ActivityListModel: Add method to refresh one Account (WIP)
      adds  cb4fba7   ActivityWidget: Created a delegate for prettier display of the activities
      adds  3bccfb8   ActivityView: Add information about the account.
      adds  cb1571c   ActivityWidget: Rather use accountState pointer directly.
      adds  a1551ef   ActivityDelegate: Make the row height public accessible.
      adds  cf9fec7   ActivityView: Add a second treeview for sync issues.
      adds  0e0b602   Activity: Unify the GUI, and reactivate copy to clipboard for all.
      adds  5e98894   ActivityView: Add a progress indicator widget to indicate action.
      adds  ff4a8c9   GeneralSettings: Remove references to protocolwidget.
      adds  aa38f7a   ActivityWidget: implement removeAccount.
      adds  81296fa   AccountManager: new method to return AccountStatePtr from the name.
      adds  731a13c   ActivityWidget: Take the account state (connected or not) in account.
      adds  ddcec29   ActivityDelegate: Gray out font if account is not connected.
      adds  caba719   Folderman: Added method to find local files for a rel. server path.
      adds  631cb09   ActivityWidget: Show the local path in a tooltip.
      adds  a56926b   ActivityWidget: open local file in file manager if exists.
      adds  ff76a84   Added some documentation.
      adds  ccb871c   ActivityWidget: Show the subject in the Tooltip.
      adds  87aa1de   Merge branch 'newactivity'
      adds  c781155   General Settings page: Remove the add account button.
      adds  e38bc6e   AcitivityWidget: Moved timespan-in-words method to utility.
      adds  459e200   ShareDialog: add a QScrollArea (issue #4125 )
      adds  8852911   Merge branch 'master' of github.com:owncloud/mirall
      adds  486d769   [tx-robot] updated from transifex
      adds  11ef07c   ActivityWidget: fix compiler warnings
      adds  6e42405   ShareDialog:  remove the search button (#3737)
      adds  ef915fb   SharedDialog: Fix the delete icon on windows and mac (#3737)
      adds  f618ed3   gui: Fix some icons in highdpi
      adds  9978dc3   QNAM: Use invalid configuration instead of default configuration
      adds  ef17dc6   Connectivity: Improve log output
      adds  52a11b0   Activities: Fix on Mac #4083
      adds  e0f5442   ShareDialog: softer line separator (#3737)
      adds  a59c3ef   some doc fixes & updates
      adds  be9ed2f   Merge pull request #4058 from owncloud/client-updates
      adds  854264c   Backport #4052 to 2.0
      adds  99b0d65   Merge pull request #4073 from RealRancor/backport_4052_2.0
      adds  914df32   Documentation: Fix PDF logo, version number
      adds  7ba88cc   Merge remote-tracking branch 'origin/2.0'
      adds  1cdf0e8   ActivityWidget: Always combine the final activity list.
      adds  c9ef4d5   ActivityWidget: Detect new items in the list to refetch the activities.
      adds  5ec4fd9   ActivityWidget: No progress indic. for non connected accounts.
      adds  32a208a   [tx-robot] updated from transifex
      adds  b37361e   Remove spacer that would constrain a vertical resize
      adds  f5da95a   ActivityWidget: Make compile with Qt4
      adds  46dbca1   ShareDialog: Remove Qt4 incompatible property of QScrollView.
      adds  3d7fc71   AccountState: Avoid ConnectionCheck if ETag job was just done.
      adds  60598c0   Use the configuration value of remotePollInterval rather than hardcoded.
      adds  65ec8a9   Connectivity: Decrease debug logging
      adds  b3c2c59   Add the set of currently used patches
      adds  fb42183   Merge remote-tracking branch 'origin/patches_list' into 2.1
      adds  6123fab   CMake version abstractions: Remove some dependencies.
      adds  300c1c2   Merge remote-tracking branch 'origin/depclean' into 2.1
      adds  3c1a605   Connectivity: Also accept SyncEngine etag as received ETag
      adds  f2d8143   Activity View: Update only if visible and when becoming visible #4083
      adds  4984da7   Activity Widget: Fix runtime warning
      adds  41a6f6d   FolderStatusModel: add hints for translators (#4158)
      adds  62d2681   SyncEngine: Handle 403 Forbidden properly.
      adds  e7ad7d4   csync_update: Add missing comment about 403 forbidden handling.
      adds  be88e5a   csync_update: refactor a bit and remove redundant code.
      adds  b0c29d5   Merge pull request #4159 from owncloud/fix_3490
      adds  8f5658b   Added Non Shibboleth WebDAV authentication and Dav Path customization to `owncloudcmd`
      adds  1ab4465   Merge remote-tracking branch 'upstream/master'
      adds  42ef09e   Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
      adds  0bcb13f   Fixxed compile error on src/gui/share.h
      adds  572d9bd   Merge remote-tracking branch 'upstream/master'
      adds  8abaf92   Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
      adds  5a7eebe   [tx-robot] updated from transifex
      adds  55a96af   tagLastSuccessfullETagRequest comment wording
      adds  eea982f   Merge pull request #4162 from owncloud/phil-davis-patch-1
      adds  5f715a7   [tx-robot] updated from transifex
      adds  887aa95   ShareDialog: Keep default server permissions by default (#4152)
      adds  952a134   Sharing: document that the two Type enum are linked
      adds  d581550   Fix compilation warning
      adds  575fc9a   ShareDialog:  show an error if the sharing API is disabled (#4126)
      adds  d6aa667   ShareDialog: remove the "Premissions" label and adjust the size of the scrollarea (#3737)
      adds  421c6a9   NetworkJobs: JSON network job now reports OCS reply code.
      adds  94e7c76   ActivityWidget: display if the server does not support acitivities.
      adds  1a59b4e   [tx-robot] updated from transifex
      adds  0020211   owncloudcmd:  Don't do a check that file are older than 2s (#4160)
      adds  ffd0b19   [tx-robot] updated from transifex
      adds  9e1f215   Dolphin plugin: build with QStringBuilder
      adds  d89cb3e   Dolphin plugin: build by default
      adds  aa168ec   [tx-robot] updated from transifex
      adds  b3f5885   [tx-robot] updated from transifex
      adds  bd72642   ShareLink: Always initialize expire date #4075
      adds  bdf830f   Add an experimental ProppatchJob #3235
      adds  a25f094   Checksums: Don't reupload if size and checksum are unchanged #3235
      adds  3b79273   csync_update: Remove disabled inode check
      adds  10db6ce   Rename files
      adds  6cf5fc7   Permissions: Keep more user permissions
      adds  2458f07   Checksums: Reuse the discovery checksum where possible
      adds  709da37   Activities: Only emit debug when actually refreshing
      adds  33dcb0c   PropagateLocalRemove: Add debug
      adds  b52a3a4   Connectivity: Improve reconnecting after network change/disconnect #4167
      adds  02daca9   [tx-robot] updated from transifex
      adds  f20e052   [tx-robot] updated from transifex
      adds  f7932bb   ShareDialog: Completion uses MatchContains #4123
      adds  f9dc569   Share dialog: Don't close on enter
      adds  adea301   Blacklist: Clear on successful chunk upload #3934
      adds  f96d94f   ShareDialog: Only link share if capabilities allow #4179
      adds  bcfdcec   Share dialog: Adjust layout #4119
      adds  7e56408   SelectiveSync: Show Apply/Cancel less
      adds  2982c79   Settings: Fix "Choose what to sync" #4187
      adds  23ed68c   Re-apply ee69ab20211720d5d124bf58f35be5b69f84971b
      adds  76ce9ff   Activity List: Improve double click handling on filenames #4168
      adds  b468767   [tx-robot] updated from transifex
      adds  c6a65c6   [tx-robot] updated from transifex
      adds  5216648   Share dialog: Work around painting bug #4189
      adds  df63579   Blacklist: Firewall errors are silenced for up to 1h only #4071
      adds  60a51f8   Add more Qt patches
      adds  127c107   Ensure patches apply cleanly, drop patch 14
      adds  1cc9070   Qt patches: Tweak more for Qt 5.4.0
      adds  1aa5703   Tests: Add a perl test for eml checksums #3235
      adds  698f47d   Blacklist: Treat all 403s the same #4071
      adds  f1faf87   [Sharing] Permissions now in dropdown menu
      adds  ece164f   [Share] Use more icon
      adds  f1435c8   Merge pull request #4199 from owncloud/permission_dropdown
      adds  8777982   NautilusPlugin: Fix detection of top level sync folder.
      adds  a708f8d   NautilusPlugin: Fix detection of the OK status
      adds  29e2877   NautilusPlugin: Fix behaviour with files with a colon in the name.
      adds  1ad8e53   SyncJournalFileRecord: Fix comparison operator
      adds  aaa5c1b   Test syncjournaldb: Fix comparison of two QDateTime objects.
      adds  e3a846b   SyncJournalTest: Use valid time for the tests.
      adds  2d604ce   Qt: Add Windows-specific patches OBS, also a QNAM fix
      adds  db5a86b   [tx-robot] updated from transifex
      adds  17566fe   Updated Changelog
      adds  9e66a6b   Settings dialog: Fix crash when deleting account #4202
      adds  b896d8a   ActivityWidget: Fix type (#4204)
      adds  10707c8   [tx-robot] updated from transifex
      adds  d62c518   show displaynames of users in share dialog instead of userid
      adds  4cb9d67   Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
      adds  3f0d575   [tx-robot] updated from transifex
      adds  4994009   [tx-robot] updated from transifex
      adds  4809746   CMake: fix CMake 2.6 compatibility
      adds  af0d0bd   CMake: Fix typo
      adds  0b5b4a5   [tx-robot] updated from transifex
      adds  b033a8e   [Sharing] Files should not have create permissions
      adds  e854757   Merge pull request #4217 from owncloud/sane_file_permissions
      adds  c79879a   [Sharing] Default capabilitie for link sharing
      adds  b26c36b   Merge pull request #4219 from owncloud/fix_link_share_stable8
      adds  559bf75   [tx-robot] updated from transifex
      adds  76d1296   Disable some code that needs lambda with old GCC
      adds  339caf9   updates for 2.1 release
      adds  d2f1c14   Merge pull request #4224 from owncloud/21update
      adds  db7d70a   Account removal: Do it inside global application object
      adds  c24a8ba   Account removal: More crash fixes for Windows
      adds  442cc63   [tx-robot] updated from transifex
      adds  4f5cf01   [tx-robot] updated from transifex
      adds  01faf10   [Sharing] Do not allow users to uset the password if it is enforced
      adds  e6ab047   ShareLinkWidget: Set state of passwd checkbox always.
      adds  52dc55d   ShareLinkWidget: Stop editing progress animation if passwd is required.
      adds  4a2b5f7   Merge pull request #4228 from owncloud/enforce_password-block
      adds  685f2a2   csync: remove PLUGIN install patch from cmake files
      adds  1f8af40   Dolphin plugin: Fix compiler warnings
      adds  9f15ba3   [Sharing] Make sure the file is actually synced to the server
      adds  fcdab1e   [Sharing] Also add sync status to SHARE_STATUS command
      adds  451ebd4   Merge pull request #4169 from owncloud/2.1_file_exists_before_share
      adds  ab5e543   Use user-readable short folder path in the context menu
      adds  a75209d   Account: Invalidate credentials when clicking "Sign out" #4241
      adds  770ad54   AccountSettings: Update the visibility of the add account button.
      adds  d15cf0c   Sharing: Remove mentioning of remote users from dialog #4234
      adds  f0e3eca   [tx-robot] updated from transifex
      adds  8900443   [tx-robot] updated from transifex
      adds  cf06083   Utilities: Include math.h because of floor()
      adds  c400679   OS X: Attempt to fix account add oddities #4237
      adds  9a9446d   [tx-robot] updated from transifex
      adds  1a564b1   more updates to 2.1 user manual
      adds  24cad42   corrections to 2.1 user manual
      adds  41c3c10   clean up screenshot
      adds  3d71d6c   more image fixes
      adds  9a25299   Merge pull request #4243 from owncloud/more21update
      adds  480861e   Editorial changes to ChangeLog
      adds  c0c9fb3   Bump to 2.1.0 final
      adds  bc191ff   Imported Upstream version 2.1.0+dfsg
      adds  2d981b3   Merge tag 'upstream/2.1.0+dfsg'
      adds  8a23e38   New upstream release
      adds  cbfbc55   Delete non used patch: 004-shell_integration_copyright
      adds  9fa5a79   Updated patch hunks
      adds  8c58661   Updated patch
      adds  f35c343   Updated patch
      adds  79d8f21   remove unnessary lintian-override
      adds  c89c5a2   build dolphin-owncloud
      adds  8b5949f   Updated copyright files
      adds  29b9b7a   Remove files that are cleaned up at build time
      adds  6364158   Merge branch 'upstream'
      adds  c543c68   Revert "build dolphin-owncloud"
      adds  8bd80aa   release to unstable
      adds  e7e4f8b   Imported Upstream version 2.1.1~rc1+dfsg
      adds  13bd592   Merge tag 'upstream/2.1.1_rc1+dfsg'
      adds  73dd815   New upstream release.
      adds  39ae875   Updated patch hunks.
      adds  d7bf8e9   Remove file that is cleaned up by build time
      adds  68057c1   Sharee.cpp: Get rid of lambdas because we still need to support GCC 4.4
      adds  78df3a3   added desktop sharing
      adds  4d175ae   Merge pull request #4247 from owncloud/desktopshare
      adds  c01220f   [tx-robot] updated from transifex
      adds  64ca94d   [tx-robot] updated from transifex
      adds  7eca3c9   [tx-robot] updated from transifex
      adds  73acad2   FF doc subrepo to adjust to new .org theming
      adds  fdeb7cc   [tx-robot] updated from transifex
      adds  eb28d17   Doc: Add checksum overview
      adds  d92c8be   UI: Sign in/out -> Log in/out #4249
      adds  1a519ac   Share UI: Respect enfore-expire #4235
      adds  cec4b80   Share UI: Hide 'can share' if capability missing #4231
      adds  a2eee7e   Share UI: Hide 'allow editing' for files #4211
      adds  230b6bc   [tx-robot] updated from transifex
      adds  179b25d   AccountWizard: Don't crash when sync is running #4221
      adds  4dfce57   Creds: Forget password on explicit sign-out #4241
      adds  3de8f27   Force account wizard when last account is deleted #4266
      adds  fe75c6a   Wizard: Find user:pw even if redirected #4265
      adds  3572e7f   Activity: Improve formatting of copied data #3498
      adds  db0674d   [tx-robot] updated from transifex
      adds  fbb85fa   Activity tab doesn't vanish with too many accounts #4188
      adds  fd18c56   SocketAPI: Fix file error cache #3944
      adds  f65a29d   SocketAPI: Ensure messages are consistent #3944
      adds  8b5474f   SocketAPI: Don't use ERROR for SoftErrors #3944
      adds  d8d9fcf   Silence warning about zorder in .ui file.
      adds  e3b53b7   Log: Remove scary messages :)
      adds  df1b309   FolderWatcher: Remove IN_DONT_FOLLOW #3475
      adds  e2d1a5a   Share UI: Allow typing in a sharee
      adds  0555c88   User Sharing: Match user names and case insensitive #4269
      adds  0d80811   [tx-robot] updated from transifex
      adds  89cb27f   [tx-robot] updated from transifex
      adds  3649c90   [tx-robot] updated from transifex
      adds  ca1c8a0   [tx-robot] updated from transifex
      adds  c5cd584   [tx-robot] updated from transifex
      adds  3664be1   [tx-robot] updated from transifex
      adds  48a0ffd   Systray: Use the original name for the rename notification #4295
      adds  11174dd   PropagateLocalRemove: Make it possible to remove read only files (#4277)
      adds  cf5b1e4   csync_vio_local_stat: Win: fetch mtime and size if not previously fetched
      adds  271b2f8   [tx-robot] updated from transifex
      adds  a0b913f   gui: Word Wrap in QInputDialog (#4197)
      adds  c607707   Backport of #4245
      adds  afa8d67   shell integration: Create a plugin for nemo out of the nautilus one.
      adds  7ed243d   Move version to 2.1.1 git.
      adds  a759ba1   Do not use nullptr, old compilers die on it.
      adds  e64833a   [tx-robot] updated from transifex
      adds  6a6bce4   [tx-robot] updated from transifex
      adds  72a503e   [tx-robot] updated from transifex
      adds  03415b2   [tx-robot] updated from transifex
      adds  a16361e   [tx-robot] updated from transifex
      adds  6d38d4e   [tx-robot] updated from transifex
      adds  92677da   [tx-robot] updated from transifex
      adds  5487fc1   Ensure Qt translator does always get loaded.
      adds  16030a6   Enable HiDpi scaling with Qt 5.6
      adds  0ef9bd9   Remove bearer plugins
      adds  970cdcf   SocketAPI: SHARE: Fix the paths when creating the share dialog
      adds  69d9840   Dolphin integration: use system icons for labels in KDE
      adds  c8b3df6   OS X: Fix alignment of "Copy" button in protocol #4207
      adds  2e7a3f9   Fix a missing sync-exclude.lst file not failing the sync
      adds  5382901   [tx-robot] updated from transifex
      adds  5cc4c03   Propagator: Deal with files becoming directories #4302
      adds  d4edab0   Propagator: Deal with directories becoming files #4302
      adds  2662203   Windows: Fix deleting and replacing of read-only files #4308
      adds  60a6b2b   OS X: Also show desktop notifications when app is active
      adds  6e38095   Fix OK statuses not being broadcasted during a sync #3944
      adds  634dad0   Debug: Attempt to make log more useful
      adds  62df938   Rename SyncFileStatus::STATUS_SYNC to STATUS_UPTODATE
      adds  93e8bba   OS X: Don't install legacy Finder plugin on >= 10.10 #3587
      adds  10f1ed7   [tx-robot] updated from transifex
      adds  ef9483c   Revert "HTTP Creds:  Do not send the password at every request"
      adds  a63ebe0   Bring back the red box for errors #3796
      adds  2f355c4   Don't show parent folders in the error list #3796
      adds  cede7ec   Work around layouting issue for RTL languages
      adds  9c7066a   Translation cleanups
      adds  e3c1d96   Update German translation
      adds  51a70ce   Document all owncloudcmd switches in man page/doc
      adds  fd7afa8   [tx-robot] updated from transifex
      adds  e9ba7c6   Keep only active entries in the Not Synced list #3171
      adds  06ffc44   Fix RTL languages in sync dialog #4336
      adds  71ad94d   Fix crash when deleting account while sync is running #4337
      adds  868d4c7   HTTP creds:  Fix GUI blocking for 5 seconds when entering wrong password
      adds  81b7798   HttpCredentials::slotAuthentication:  fix comment
      adds  e7e918d   Only clean the Not Synced list for the current account #3171
      adds  bb6a50b   SettingsDialog: show "Account" for the tab name for branded client
      adds  ce6f903   Fix the rendering of the red error box text
      adds  d4b6b5c   Propagator: Remove warning when moving out of deleted folder
      adds  abf5a5a   Propagation: Fix dir <-> file changes propagating to server #4302
      adds  49824b9   [tx-robot] updated from transifex
      adds  0f658e5   OS X: Don't install legacy Finder plugin on >= 10.10 #3587 (v2)
      adds  63bc383   [tx-robot] updated from transifex
      adds  ed6f76c   [tx-robot] updated from transifex
      adds  4d8f81d   [tx-robot] updated from transifex
      adds  d89edc3   csync-tests: Added some directory wildcard tests.
      adds  536fd10   [tx-robot] updated from transifex
      adds  ea03f9d   NSIS: Escape line endings for NSIS correctly.
      adds  54c2c9a   Windows: Fix HiDPI #3414
      adds  aafab73   add note re mtime syncing
      adds  95615ea   Merge pull request #4338 from owncloud/mtimes
      adds  9c9b9f3   Activities: Fix color when row is selected
      adds  8c53187   [tx-robot] updated from transifex
      adds  74b0d2d   [tx-robot] updated from transifex
      adds  bb5c370   Windows: Update the overlay icon graphics #3105
      adds  1ed02f6   Sharing: Display the error from the server when trying to share with users or group
      adds  9800101   Sharing: feedback when there is no result while searching for an user #4348
      adds  580b6e2   [tx-robot] updated from transifex
      adds  272755e   ConfigFile: Create the directory when using --confdir and it does not exist
      adds  31da3e9   Fix the folder option button click
      adds  a18b13d   FolderDelegate: fix positions and margin
      adds  bbedeed   SyncEngine: For server older than 8.1, ignore invalid char in new directories
      adds  2e5f28d   [tx-robot] updated from transifex
      adds  19a3a10   Windows: Fix the progress text being cut but a few pixels
      adds  7beb6f2   Windows shell: Remove unneeded Winsock code #4356
      adds  439eddb   OS X shell: Don't allow sharing sync roots #3505
      adds  9d6d14d   [tx-robot] updated from transifex
      adds  a41fbc0   csync_private: Fix comment about size of file id buffer
      adds  d12c093   Upload: Chunk size can be changed in the config file
      adds  81204ee   [tx-robot] updated from transifex
      adds  3f704a7   [tx-robot] updated from transifex
      adds  e88410d   [tx-robot] updated from transifex
      adds  a877278   shell: Update binaries to fix the Directory Opus warning
      adds  f03f845   Changelog for 2.1.1
      adds  21e3df4   Add mac system tray fix as deployed on the build machine
      adds  17895f3   Win: Fix filesystem detection for exFAT workaround #2701
      adds  7a676a7   AccountSettings:  fix Add Folder button size #4373
      adds  76bf93e   [tx-robot] updated from transifex
      adds  2c6546f   [tx-robot] updated from transifex
      adds  7f44e83   Share dialog: Remove unintended spinner when password required
      adds  4d52838   Share dialog: Error reporting with password policy #4209
      adds  1534dad   Sharing: Allow only one share dialog per path #3184
      adds  47710d1   SyncEngine: fix inode after move if the file has moved on the file system
      adds  93986e0   [tx-robot] updated from transifex
      adds  c23ae5a   Win Admin: Added script to create stable toolchain prj. in OBS
      adds  f15f4aa   [tx-robot] updated from transifex
      adds  8486a2f   Bring back the automatic authentication popups
      adds  7eba784   Share dialog: More error handling with password policy #4209
      adds  c372406   Fix gen_sym_files.py trying to process non-macho files
      adds  6096a83   Do a codesign --verify before running spctl
      adds  110f371   OS X: Make sure Qt frameworks have the right structure
      adds  5092243   OS X: Fix macdeployqt not to embed symlinks when ran multiple times
      adds  46e384a   OS X: The --strict option isn't supported on the build machine
      adds  0634448   [tx-robot] updated from transifex
      adds  8de21cc   [tx-robot] updated from transifex
      adds  ba87178   [tx-robot] updated from transifex
      adds  5ae81aa   Nemo Shell Integration: Add missing conversion script.
      adds  8480fc7   [tx-robot] updated from transifex
      adds  7ddfa79   csync_update: Use the csync defines rather than plain numbers.
      adds  28907ec   csync_update: Handle comparision of file types properly.
      adds  57c7727   csync_update: Remove unneeded checks of previous commit.
      adds  4cf94ed   Merge pull request #4396 from owncloud/fix_enum_csync
      adds  a92c756   [tx-robot] updated from transifex
      adds  d42faa8   [tx-robot] updated from transifex
      adds  25e0d1e   [tx-robot] updated from transifex
      adds  e4ae279   Fix the crash reporter not launching
      adds  6701927   Move ocdoc to current documentation master to catch up with new design
      adds  834a971   Add Dockerfile that allows cross compiling the client
      adds  b0acc47   Bring build documentation up to date, use docker for Win32 xbuild
      adds  54a278e   fix compilation with TOKEN_AUTH_ONLY
      adds  e397056   Enable replacement of strange substrings also for nsh files.
      adds  6565558   Doc: Instruct to use sha256 for Authenticode signing
      adds  24920a4   update Changelog
      adds  6b643c7   Discovery: don't ignore recall file #4420
      adds  f140d34   OS X: Fix the file system watcher ignoring unicode paths #4424
      adds  72e1464   Update ChangeLog
      adds  b70a95b   nsi translations: finally escape the NSIS lineends correctly.
      adds  95a58e7   [tx-robot] updated from transifex
      adds  df0a33f   Push VERSION.cmake file to rc2
      adds  a768ce5   Imported Upstream version 2.1.1~rc2+dfsg
      adds  1867979   Merge tag 'upstream/2.1.1_rc2+dfsg'
      adds  e663355   New upsteam release.
      adds  e1eaa21   new upstream release
      adds  7fd9e75   [tx-robot] updated from transifex
      adds  ae3b9f1   Linux shell integration: Do not call sed from absolute path.
      adds  c98bf17   ChangeLog: Set release date
      adds  eeec892   Update VERSION.cmake to v2.1.1 final
      adds  66bc789   Imported Upstream version 2.1.1+dfsg
      adds  196d8fe   Merge tag 'upstream/2.1.1+dfsg'
      adds  d5dc0af   Drop self from copyright
      adds  b29e9ce   Merge remote-tracking branch 'origin/master'
      adds  98f2ba6   Release to unstable
       new  68322b9   Merge tag 'debian/2.1.1+dfsg-1' into jessie-backports
       new  d1a8bd3   Update changelog for version 2.1.1+dfsg-1~bpo8+1

The 2 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.


Summary of changes:
 .gitmodules                                        |    3 +
 .tag                                               |    2 +-
 CMakeLists.txt                                     |    7 -
 ChangeLog                                          |   77 +-
 README.md                                          |    2 +-
 VERSION.cmake                                      |    4 +-
 client.qrc                                         |    2 +
 cmake/modules/DefineInstallationPaths.cmake        |    5 -
 cmake/modules/FindNeon.cmake                       |   73 -
 cmake/modules/QtVersionAbstraction.cmake           |   19 +-
 config.h.in                                        |    4 -
 csync/ConfigureChecks.cmake                        |    1 -
 csync/config_csync.h.cmake                         |    5 -
 csync/src/CMakeLists.txt                           |   16 -
 csync/src/csync.c                                  |   50 +-
 csync/src/csync.h                                  |   32 +-
 csync/src/csync_exclude.c                          |  104 +-
 csync/src/csync_macros.h                           |    1 +
 csync/src/csync_misc.c                             |   13 +-
 csync/src/csync_owncloud.c                         |  617 -------
 csync/src/csync_owncloud.h                         |   36 -
 csync/src/csync_owncloud_private.h                 |  115 --
 csync/src/csync_owncloud_util.c                    |  125 --
 csync/src/csync_private.h                          |   16 +-
 csync/src/csync_reconcile.c                        |    8 +-
 csync/src/csync_statedb.c                          |   59 +-
 csync/src/csync_update.c                           |  199 ++-
 csync/src/csync_util.c                             |    1 +
 csync/src/httpbf/CMakeLists.txt                    |   57 -
 csync/src/httpbf/README                            |   29 -
 csync/src/httpbf/client/CMakeLists.txt             |   36 -
 csync/src/httpbf/client/httpbf_client.c            |  225 ---
 csync/src/httpbf/src/CMakeLists.txt                |   38 -
 csync/src/httpbf/src/httpbf.c                      |  688 --------
 csync/src/httpbf/src/httpbf.h                      |  142 --
 csync/src/httpbf/tests/CMakeLists.txt              |   18 -
 csync/src/httpbf/tests/church.jpg                  |  Bin 1278765 -> 0 bytes
 csync/src/httpbf/tests/hbf_send_test.c             |  162 --
 csync/src/vio/csync_vio.c                          |    6 -
 csync/src/vio/csync_vio_local_unix.c               |   10 -
 csync/src/vio/csync_vio_local_win.c                |  153 +-
 csync/tests/CMakeLists.txt                         |    5 -
 csync/tests/csync_tests/check_csync_exclude.c      |   38 +-
 csync/tests/csync_tests/check_csync_update.c       |    7 +-
 csync/tests/httpbf_tests/hbf_send_test.c           |  241 ---
 csync/tests/ownCloud/ownCloud/Test.pm              |   28 +-
 csync/tests/ownCloud/t9.pl                         |   91 +
 csync/tests/vio_tests/check_vio.c                  |   52 -
 debian/changelog                                   |   24 +
 debian/copyright                                   |   21 +-
 debian/libowncloudsync0.lintian-overrides          |    2 -
 debian/patches/0001-disable-updatecheck.patch      |   14 +-
 debian/patches/0002-debian_version.patch           |   16 +-
 .../patches/0004-shell_integration_copyright.patch |   19 -
 ...lags.patch => 0004-use_system_buildflags.patch} |    0
 debian/patches/0005-remove_admin.patch             |    6 +-
 debian/patches/0006-move-configfile.patch          |   12 +-
 debian/patches/0007-move-translations.patch        |   16 +-
 debian/patches/series                              |    3 +-
 doc/advancedusage.rst                              |    8 +-
 doc/autoupdate.rst                                 |   30 +-
 doc/building.rst                                   |  115 +-
 doc/conf.py.in                                     |    8 +-
 doc/images/client-7.png                            |  Bin 5865 -> 4439 bytes
 doc/images/client-8.png                            |  Bin 0 -> 83622 bytes
 doc/images/client-9.png                            |  Bin 0 -> 53065 bytes
 doc/images/client10.png                            |  Bin 40245 -> 0 bytes
 doc/images/client6.png                             |  Bin 53600 -> 50517 bytes
 doc/images/client7.png                             |  Bin 42112 -> 0 bytes
 doc/images/client8.png                             |  Bin 44898 -> 0 bytes
 doc/images/client9.png                             |  Bin 59958 -> 0 bytes
 doc/images/mac-share.png                           |  Bin 0 -> 59496 bytes
 doc/images/menu.png                                |  Bin 4969 -> 101298 bytes
 doc/images/share-1.png                             |  Bin 0 -> 18267 bytes
 doc/images/share-2.png                             |  Bin 0 -> 24573 bytes
 doc/installing.rst                                 |    6 +-
 doc/introduction.rst                               |   43 +-
 doc/logo-blue.pdf                                  |  Bin 1849 -> 1851 bytes
 doc/navigating.rst                                 |  191 ++-
 doc/owncloudcmd.1.rst                              |   18 +
 doc/owncloudcmd.rst                                |   37 +-
 doc/visualtour.rst                                 |   12 +-
 resources/delete.png                               |  Bin 0 -> 243 bytes
 resources/more.png                                 |  Bin 0 -> 122 bytes
 shell_integration/CMakeLists.txt                   |   14 +-
 .../dolphin/0001-KOverlayIconPlugin.patch          |  256 ---
 shell_integration/dolphin/CMakeLists.txt           |   53 +-
 shell_integration/dolphin/README                   |   15 +-
 .../dolphin/ownclouddolphinactionplugin.cpp        |   66 +
 .../dolphin/ownclouddolphinactionplugin.desktop    |    6 +
 .../dolphin/ownclouddolphinoverlayplugin.cpp       |  101 ++
 .../dolphin/ownclouddolphinoverlayplugin.json      |    8 +
 .../dolphin/ownclouddolphinplugin.cpp              |  131 --
 .../dolphin/ownclouddolphinplugin.desktop          |    6 -
 .../dolphin/ownclouddolphinpluginhelper.cpp        |   98 ++
 .../dolphin/ownclouddolphinpluginhelper.h          |   52 +
 .../dolphin_kf5/0001-KOverlayIconPlugin.patch      |  267 ---
 shell_integration/dolphin_kf5/CMakeLists.txt       |   30 -
 shell_integration/dolphin_kf5/README               |   16 -
 .../dolphin_kf5/ownclouddolphinplugin.cpp          |  131 --
 .../dolphin_kf5/ownclouddolphinplugin.desktop      |    6 -
 .../icons/nopadding/SVG/attention.svg              |   72 +-
 shell_integration/icons/nopadding/SVG/error.svg    |   75 +-
 .../icons/nopadding/SVG/generate_windows_ico.sh    |    8 +
 shell_integration/icons/nopadding/SVG/ok.svg       |   59 +-
 shell_integration/icons/nopadding/SVG/shared.svg   |  109 +-
 shell_integration/icons/nopadding/SVG/sync.svg     |  103 +-
 shell_integration/nautilus/CMakeLists.txt          |   14 +-
 shell_integration/nautilus/createnemoplugin.sh     |    6 +
 shell_integration/nautilus/setappname.sh           |    2 +-
 shell_integration/nautilus/syncstate.py            |   96 +-
 src/cmd/cmd.cpp                                    |   66 +-
 src/gui/CMakeLists.txt                             |   22 +-
 src/gui/accountmanager.cpp                         |   10 +
 src/gui/accountmanager.h                           |   11 +-
 src/gui/accountsettings.cpp                        |  217 ++-
 src/gui/accountsettings.h                          |    8 +-
 src/gui/accountsettings.ui                         |   50 +-
 src/gui/accountstate.cpp                           |   69 +-
 src/gui/accountstate.h                             |   20 +-
 src/gui/activityitemdelegate.cpp                   |  164 ++
 ...lderstatusdelegate.h => activityitemdelegate.h} |   40 +-
 src/gui/activitywidget.cpp                         |  496 ++++++
 src/gui/activitywidget.h                           |  202 +++
 src/gui/activitywidget.ui                          |   45 +
 src/gui/application.cpp                            |   93 +-
 src/gui/application.h                              |    3 +
 src/gui/clipboard.mm                               |   16 +
 src/gui/creds/httpcredentialsgui.cpp               |   26 +-
 src/gui/creds/httpcredentialsgui.h                 |    3 +-
 src/gui/creds/shibboleth/shibbolethrefresher.cpp   |   55 -
 src/gui/creds/shibboleth/shibbolethrefresher.h     |   53 -
 src/gui/creds/shibboleth/shibbolethuserjob.cpp     |    7 +-
 src/gui/creds/shibboleth/shibbolethuserjob.h       |    2 +-
 src/gui/creds/shibbolethcredentials.cpp            |  139 +-
 src/gui/creds/shibbolethcredentials.h              |   15 +-
 src/gui/folder.cpp                                 |  130 +-
 src/gui/folder.h                                   |   20 +-
 src/gui/folderman.cpp                              |  108 +-
 src/gui/folderman.h                                |   15 +-
 src/gui/folderstatusdelegate.cpp                   |  174 +-
 src/gui/folderstatusdelegate.h                     |    8 +-
 src/gui/folderstatusmodel.cpp                      |  290 +++-
 src/gui/folderstatusmodel.h                        |   41 +-
 src/gui/folderwatcher.cpp                          |   88 +-
 src/gui/folderwatcher.h                            |   26 +-
 src/gui/folderwatcher_linux.cpp                    |    3 +-
 src/gui/folderwatcher_mac.cpp                      |    2 +-
 src/gui/folderwizard.cpp                           |    4 +-
 src/gui/folderwizardtargetpage.ui                  |   15 +-
 src/gui/generalsettings.cpp                        |   17 +-
 src/gui/generalsettings.h                          |    4 +-
 src/gui/generalsettings.ui                         |   91 +-
 src/gui/ignorelisteditor.cpp                       |    4 +
 src/gui/logbrowser.cpp                             |    2 +-
 src/gui/main.cpp                                   |   23 +
 src/gui/networksettings.cpp                        |   21 +
 src/gui/networksettings.ui                         |   10 +-
 src/gui/ocsjob.cpp                                 |  124 ++
 src/gui/ocsjob.h                                   |  131 ++
 src/gui/ocsshareejob.cpp                           |   46 +
 src/gui/ocsshareejob.h                             |   55 +
 src/gui/ocssharejob.cpp                            |  137 ++
 src/gui/ocssharejob.h                              |  127 ++
 src/gui/owncloudgui.cpp                            |   99 +-
 src/gui/owncloudgui.h                              |    3 +
 src/gui/owncloudsetupwizard.cpp                    |    4 +-
 src/gui/protocolwidget.cpp                         |  170 +-
 src/gui/protocolwidget.h                           |   17 +-
 src/gui/protocolwidget.ui                          |   92 +-
 src/gui/proxyauthhandler.h                         |    2 +-
 src/gui/quotainfo.cpp                              |    7 +-
 src/gui/quotainfo.h                                |    6 +-
 src/gui/selectivesyncdialog.cpp                    |   29 +-
 src/gui/selectivesyncdialog.h                      |    4 +-
 src/gui/settingsdialog.cpp                         |  131 +-
 src/gui/settingsdialog.h                           |   11 +-
 src/gui/settingsdialog.ui                          |   26 +-
 src/gui/settingsdialogmac.cpp                      |   25 +-
 src/gui/settingsdialogmac.h                        |    7 +-
 src/gui/share.cpp                                  |  325 ++++
 src/gui/share.h                                    |  291 ++++
 src/gui/sharedialog.cpp                            |  756 +--------
 src/gui/sharedialog.h                              |  104 +-
 src/gui/sharedialog.ui                             |  210 +--
 src/gui/sharee.cpp                                 |  226 +++
 src/gui/sharee.h                                   |   92 +
 src/gui/sharelinkwidget.cpp                        |  543 ++++++
 src/gui/sharelinkwidget.h                          |  115 ++
 src/gui/{sharedialog.ui => sharelinkwidget.ui}     |  247 ++-
 src/gui/shareusergroupwidget.cpp                   |  431 +++++
 src/gui/shareusergroupwidget.h                     |  132 ++
 src/gui/shareusergroupwidget.ui                    |   66 +
 src/gui/sharewidget.ui                             |  104 ++
 src/gui/socketapi.cpp                              |  180 +-
 src/gui/socketapi.h                                |   11 +-
 src/gui/sslbutton.cpp                              |    5 +-
 src/gui/synclogdialog.cpp                          |   52 +
 .../capabilities.h => gui/synclogdialog.h}         |   37 +-
 src/gui/synclogdialog.ui                           |   38 +
 src/gui/syncrunfilelog.cpp                         |    3 +
 src/gui/systray.mm                                 |   19 +
 src/gui/thumbnailjob.cpp                           |   40 +
 src/gui/thumbnailjob.h                             |   51 +
 src/gui/updater/ocupdater.cpp                      |    6 +-
 src/gui/updater/ocupdater.h                        |    8 +-
 src/gui/wizard/owncloudadvancedsetuppage.cpp       |    3 +-
 src/gui/wizard/owncloudhttpcredspage.cpp           |   19 +
 src/gui/wizard/owncloudwizardresultpage.cpp        |    2 +-
 src/libsync/CMakeLists.txt                         |   25 +-
 src/libsync/abstractnetworkjob.cpp                 |   19 +-
 src/libsync/abstractnetworkjob.h                   |    7 +-
 src/libsync/accessmanager.cpp                      |    7 +-
 src/libsync/account.cpp                            |   43 +-
 src/libsync/account.h                              |    9 +-
 src/libsync/bandwidthmanager.cpp                   |    4 +-
 src/libsync/capabilities.cpp                       |   63 +-
 src/libsync/capabilities.h                         |   22 +-
 src/libsync/checksums.cpp                          |  249 +++
 src/libsync/checksums.h                            |  138 ++
 src/libsync/clientproxy.cpp                        |   33 -
 src/libsync/clientproxy.h                          |    1 -
 src/libsync/configfile.cpp                         |   21 +-
 src/libsync/configfile.h                           |    3 +-
 src/libsync/connectionvalidator.cpp                |   32 +-
 src/libsync/connectionvalidator.h                  |   18 +-
 src/libsync/creds/abstractcredentials.h            |   26 +-
 src/libsync/creds/credentialscommon.cpp            |   47 -
 src/libsync/creds/credentialscommon.h              |    7 -
 src/libsync/creds/dummycredentials.cpp             |   13 +-
 src/libsync/creds/dummycredentials.h               |    6 +-
 src/libsync/creds/httpcredentials.cpp              |  191 +--
 src/libsync/creds/httpcredentials.h                |   12 +-
 src/libsync/creds/tokencredentials.cpp             |   58 +-
 src/libsync/creds/tokencredentials.h               |    6 +-
 src/libsync/discoveryphase.cpp                     |   44 +-
 src/libsync/discoveryphase.h                       |   21 +-
 src/libsync/excludedfiles.cpp                      |   80 +
 src/libsync/excludedfiles.h                        |   74 +
 src/libsync/filesystem.cpp                         |  116 +-
 src/libsync/filesystem.h                           |   39 +-
 src/libsync/logger.cpp                             |   33 +-
 src/libsync/logger.h                               |    1 +
 src/libsync/networkjobs.cpp                        |  128 +-
 src/libsync/networkjobs.h                          |   65 +-
 src/libsync/owncloudpropagator.cpp                 |  247 +--
 src/libsync/owncloudpropagator.h                   |   81 +-
 src/libsync/owncloudpropagator_p.h                 |   11 +-
 src/libsync/ownsql.cpp                             |    7 +
 src/libsync/ownsql.h                               |    3 +
 src/libsync/progressdispatcher.cpp                 |   55 +-
 src/libsync/progressdispatcher.h                   |   10 +-
 src/libsync/propagatedownload.cpp                  |  158 +-
 src/libsync/propagatedownload.h                    |   21 +-
 src/libsync/propagateremotedelete.cpp              |    2 +-
 src/libsync/propagateremotemkdir.cpp               |   31 +-
 src/libsync/propagateremotemkdir.h                 |   13 +-
 src/libsync/propagateremotemove.cpp                |   11 +-
 src/libsync/propagateupload.cpp                    |  195 ++-
 src/libsync/propagateupload.h                      |   28 +-
 src/libsync/propagator_legacy.cpp                  |  735 --------
 src/libsync/propagator_legacy.h                    |  161 --
 src/libsync/propagatorjobs.cpp                     |   49 +-
 src/libsync/propagatorjobs.h                       |   15 +-
 src/libsync/syncengine.cpp                         |  227 ++-
 src/libsync/syncengine.h                           |   23 +-
 src/libsync/syncfileitem.h                         |   26 +-
 src/libsync/syncfilestatus.cpp                     |    2 +-
 src/libsync/syncfilestatus.h                       |    2 +-
 src/libsync/syncjournaldb.cpp                      |  221 ++-
 src/libsync/syncjournaldb.h                        |   35 +-
 src/libsync/syncjournalfilerecord.cpp              |   54 +-
 src/libsync/syncjournalfilerecord.h                |   12 +-
 src/libsync/theme.cpp                              |   19 +-
 src/libsync/theme.h                                |    1 +
 src/libsync/transmissionchecksumvalidator.cpp      |  151 --
 src/libsync/transmissionchecksumvalidator.h        |   80 -
 src/libsync/utility.cpp                            |   64 +-
 src/libsync/utility.h                              |   20 +-
 sync-exclude.lst                                   |   40 +-
 test/CMakeLists.txt                                |   15 +-
 test/owncloud_add_test.cmake                       |    2 +
 test/test_journal.db                               |  Bin 57344 -> 57344 bytes
 ...checksumvalidator.h => testchecksumvalidator.h} |   64 +-
 test/testcsyncsqlite.h                             |   10 -
 test/testexcludedfiles.h                           |   50 +
 test/testowncloudpropagator.h                      |   15 +
 test/testownsql.h                                  |    4 +-
 test/testsyncjournaldb.h                           |   60 +-
 translations/client_ca.ts                          | 1284 ++++++++------
 translations/client_cs.ts                          | 1284 ++++++++------
 translations/client_de.ts                          | 1286 ++++++++------
 translations/client_el.ts                          | 1286 ++++++++------
 translations/client_en.ts                          | 1207 ++++++++------
 translations/client_es.ts                          | 1306 +++++++++------
 translations/client_es_AR.ts                       | 1244 ++++++++------
 translations/client_et.ts                          | 1304 +++++++++------
 translations/client_eu.ts                          | 1454 +++++++++-------
 translations/client_fa.ts                          | 1264 ++++++++------
 translations/client_fi.ts                          | 1326 ++++++++-------
 translations/client_fr.ts                          | 1294 ++++++++------
 translations/client_gl.ts                          | 1282 ++++++++------
 translations/client_hu.ts                          | 1272 ++++++++------
 translations/client_it.ts                          | 1284 ++++++++------
 translations/client_ja.ts                          | 1372 ++++++++-------
 translations/client_nb_NO.ts                       | 1282 ++++++++------
 translations/client_nl.ts                          | 1286 ++++++++------
 translations/client_pl.ts                          | 1276 ++++++++------
 translations/client_pt.ts                          | 1296 ++++++++------
 translations/client_pt_BR.ts                       | 1294 ++++++++------
 translations/client_ru.ts                          | 1284 ++++++++------
 translations/client_sk.ts                          | 1284 ++++++++------
 translations/client_sl.ts                          | 1372 ++++++++-------
 translations/client_sr.ts                          | 1346 ++++++++-------
 translations/client_sv.ts                          | 1403 +++++++++-------
 translations/client_th.ts                          | 1298 +++++++++------
 translations/client_tr.ts                          | 1360 ++++++++-------
 translations/client_uk.ts                          | 1334 ++++++++-------
 translations/client_zh_CN.ts                       | 1286 ++++++++------
 translations/client_zh_TW.ts                       | 1760 +++++++++++---------
 320 files changed, 33834 insertions(+), 26087 deletions(-)
 delete mode 100644 cmake/modules/FindNeon.cmake
 delete mode 100644 csync/src/csync_owncloud.c
 delete mode 100644 csync/src/csync_owncloud.h
 delete mode 100644 csync/src/csync_owncloud_private.h
 delete mode 100644 csync/src/csync_owncloud_util.c
 delete mode 100644 csync/src/httpbf/CMakeLists.txt
 delete mode 100644 csync/src/httpbf/README
 delete mode 100644 csync/src/httpbf/client/CMakeLists.txt
 delete mode 100644 csync/src/httpbf/client/httpbf_client.c
 delete mode 100644 csync/src/httpbf/src/CMakeLists.txt
 delete mode 100644 csync/src/httpbf/src/httpbf.c
 delete mode 100644 csync/src/httpbf/src/httpbf.h
 delete mode 100644 csync/src/httpbf/tests/CMakeLists.txt
 delete mode 100644 csync/src/httpbf/tests/church.jpg
 delete mode 100644 csync/src/httpbf/tests/hbf_send_test.c
 delete mode 100644 csync/tests/httpbf_tests/hbf_send_test.c
 create mode 100755 csync/tests/ownCloud/t9.pl
 delete mode 100644 debian/patches/0004-shell_integration_copyright.patch
 rename debian/patches/{use_system_buildflags.patch => 0004-use_system_buildflags.patch} (100%)
 create mode 100644 doc/images/client-8.png
 create mode 100644 doc/images/client-9.png
 delete mode 100755 doc/images/client10.png
 delete mode 100755 doc/images/client7.png
 delete mode 100755 doc/images/client8.png
 delete mode 100755 doc/images/client9.png
 create mode 100644 doc/images/mac-share.png
 create mode 100644 doc/images/share-1.png
 create mode 100644 doc/images/share-2.png
 create mode 100644 resources/delete.png
 create mode 100644 resources/more.png
 delete mode 100644 shell_integration/dolphin/0001-KOverlayIconPlugin.patch
 create mode 100644 shell_integration/dolphin/ownclouddolphinactionplugin.cpp
 create mode 100644 shell_integration/dolphin/ownclouddolphinactionplugin.desktop
 create mode 100644 shell_integration/dolphin/ownclouddolphinoverlayplugin.cpp
 create mode 100644 shell_integration/dolphin/ownclouddolphinoverlayplugin.json
 delete mode 100644 shell_integration/dolphin/ownclouddolphinplugin.cpp
 delete mode 100644 shell_integration/dolphin/ownclouddolphinplugin.desktop
 create mode 100644 shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
 create mode 100644 shell_integration/dolphin/ownclouddolphinpluginhelper.h
 delete mode 100644 shell_integration/dolphin_kf5/0001-KOverlayIconPlugin.patch
 delete mode 100644 shell_integration/dolphin_kf5/CMakeLists.txt
 delete mode 100644 shell_integration/dolphin_kf5/README
 delete mode 100644 shell_integration/dolphin_kf5/ownclouddolphinplugin.cpp
 delete mode 100644 shell_integration/dolphin_kf5/ownclouddolphinplugin.desktop
 create mode 100755 shell_integration/icons/nopadding/SVG/generate_windows_ico.sh
 create mode 100755 shell_integration/nautilus/createnemoplugin.sh
 create mode 100644 src/gui/activityitemdelegate.cpp
 copy src/gui/{folderstatusdelegate.h => activityitemdelegate.h} (53%)
 create mode 100644 src/gui/activitywidget.cpp
 create mode 100644 src/gui/activitywidget.h
 create mode 100644 src/gui/activitywidget.ui
 create mode 100644 src/gui/clipboard.mm
 delete mode 100644 src/gui/creds/shibboleth/shibbolethrefresher.cpp
 delete mode 100644 src/gui/creds/shibboleth/shibbolethrefresher.h
 create mode 100644 src/gui/ocsjob.cpp
 create mode 100644 src/gui/ocsjob.h
 create mode 100644 src/gui/ocsshareejob.cpp
 create mode 100644 src/gui/ocsshareejob.h
 create mode 100644 src/gui/ocssharejob.cpp
 create mode 100644 src/gui/ocssharejob.h
 create mode 100644 src/gui/share.cpp
 create mode 100644 src/gui/share.h
 create mode 100644 src/gui/sharee.cpp
 create mode 100644 src/gui/sharee.h
 create mode 100644 src/gui/sharelinkwidget.cpp
 create mode 100644 src/gui/sharelinkwidget.h
 copy src/gui/{sharedialog.ui => sharelinkwidget.ui} (68%)
 create mode 100644 src/gui/shareusergroupwidget.cpp
 create mode 100644 src/gui/shareusergroupwidget.h
 create mode 100644 src/gui/shareusergroupwidget.ui
 create mode 100644 src/gui/sharewidget.ui
 create mode 100644 src/gui/synclogdialog.cpp
 copy src/{libsync/capabilities.h => gui/synclogdialog.h} (54%)
 create mode 100644 src/gui/synclogdialog.ui
 create mode 100644 src/gui/thumbnailjob.cpp
 create mode 100644 src/gui/thumbnailjob.h
 create mode 100644 src/libsync/checksums.cpp
 create mode 100644 src/libsync/checksums.h
 create mode 100644 src/libsync/excludedfiles.cpp
 create mode 100644 src/libsync/excludedfiles.h
 delete mode 100644 src/libsync/propagator_legacy.cpp
 delete mode 100644 src/libsync/propagator_legacy.h
 delete mode 100644 src/libsync/transmissionchecksumvalidator.cpp
 delete mode 100644 src/libsync/transmissionchecksumvalidator.h
 rename test/{testtranschecksumvalidator.h => testchecksumvalidator.h} (54%)
 create mode 100644 test/testexcludedfiles.h

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