[Pkg-owncloud-commits] [owncloud-client] 422/498: Merge remote-tracking branch 'origin/master' into new_nsis_modules

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b8d21bdd51d63edd7a019fb40e37796cff05e57f
Merge: b9edc64 a501bf5
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Jul 31 18:20:27 2015 +0200

    Merge remote-tracking branch 'origin/master' into new_nsis_modules

 CMakeLists.txt                          |   5 +
 admin/osx/macosx.pkgproj                |   4 +-
 admin/osx/post_install.sh.cmake         |   5 +
 admin/win/nsi/l10n/bin/l10n.sh          |   4 +-
 config.h.in                             |   2 +-
 csync/config_csync.h.cmake              |   1 -
 csync/src/csync.c                       |   4 +
 csync/src/csync.h                       |  59 +++----
 csync/src/csync_exclude.h               |   3 +-
 csync/src/csync_private.h               |   4 +-
 csync/src/csync_reconcile.c             |  13 +-
 csync/src/csync_statedb.c               |   5 +-
 csync/src/csync_update.c                |  92 ++++++-----
 csync/src/vio/csync_vio_local_win.c     |   7 +-
 csync/tests/vio_tests/check_vio_ext.c   |  51 ++++---
 shell_integration/nautilus/syncstate.py |  26 ++--
 src/3rdparty/qtmacgoodies               |   2 +-
 src/cmd/cmd.cpp                         |  14 +-
 src/gui/CMakeLists.txt                  |   7 +-
 src/gui/accountmanager.cpp              |  13 +-
 src/gui/accountmanager.h                |   6 +
 src/gui/accountsettings.cpp             |  30 +++-
 src/gui/accountsettings.h               |   2 +
 src/gui/accountsettings.ui              |   3 +
 src/gui/application.cpp                 |  21 +--
 src/gui/application.h                   |   1 -
 src/gui/creds/httpcredentialsgui.cpp    |  23 ++-
 src/gui/creds/httpcredentialsgui.h      |   2 +-
 src/gui/folder.cpp                      |  48 +++++-
 src/gui/folder.h                        |  15 +-
 src/gui/folderman.cpp                   |  23 ++-
 src/gui/folderman.h                     |   4 +-
 src/gui/folderstatusmodel.cpp           |   6 +-
 src/gui/folderwatcher.cpp               |  25 ++-
 src/gui/folderwatcher.h                 |   5 +
 src/gui/generalsettings.cpp             |  11 +-
 src/gui/generalsettings.h               |   1 +
 src/gui/generalsettings.ui              |   5 +-
 src/gui/ignorelisteditor.cpp            |  23 +++
 src/gui/ignorelisteditor.h              |   2 +
 src/gui/ignorelisteditor.ui             | 177 ++++++++++++---------
 src/gui/networksettings.cpp             |  14 +-
 src/gui/networksettings.h               |   1 +
 src/gui/networksettings.ui              |  17 +--
 src/gui/owncloudgui.cpp                 |   2 +-
 src/gui/owncloudgui.h                   |   2 +
 src/gui/owncloudsetupwizard.cpp         |   4 +-
 src/gui/protocolwidget.h                |   2 +
 src/gui/proxyauthdialog.cpp             |  53 +++++++
 src/gui/proxyauthdialog.h               |  52 +++++++
 src/gui/proxyauthdialog.ui              | 115 ++++++++++++++
 src/gui/proxyauthhandler.cpp            | 263 ++++++++++++++++++++++++++++++++
 src/gui/proxyauthhandler.h              | 112 ++++++++++++++
 src/gui/settingsdialogmac.cpp           |  15 +-
 src/gui/sharedialog.cpp                 |  73 ++++++++-
 src/gui/sharedialog.h                   |  15 ++
 src/gui/socketapi.cpp                   |   7 +
 src/gui/sslbutton.cpp                   |   2 +-
 src/gui/updater/ocupdater.cpp           |  93 +++++++++--
 src/gui/updater/ocupdater.h             |  61 +++++++-
 src/gui/updater/sparkleupdater_mac.mm   |   2 +-
 src/gui/updater/updater.cpp             |   6 +
 src/gui/updater/updater.h               |   2 +
 src/libsync/CMakeLists.txt              |   1 +
 src/libsync/abstractnetworkjob.cpp      |   3 +-
 src/libsync/accessmanager.cpp           |  19 +--
 src/libsync/accessmanager.h             |   2 -
 src/libsync/account.cpp                 |  16 +-
 src/libsync/account.h                   |  11 +-
 src/libsync/capabilities.cpp            |  41 +++++
 src/libsync/capabilities.h              |  44 ++++++
 src/libsync/configfile.cpp              |  37 +++--
 src/libsync/configfile.h                |  14 +-
 src/libsync/creds/httpcredentials.cpp   |   9 +-
 src/libsync/creds/httpcredentials.h     |   2 +-
 src/libsync/discoveryphase.cpp          |  19 ++-
 src/libsync/discoveryphase.h            |  12 +-
 src/libsync/filesystem.cpp              |   3 +
 src/libsync/networkjobs.cpp             |   3 +-
 src/libsync/propagatedownload.cpp       |  15 +-
 src/libsync/propagateupload.cpp         |   2 +
 src/libsync/syncengine.cpp              |  29 +++-
 src/libsync/syncengine.h                |  12 +-
 src/libsync/syncfileitem.h              |   3 +-
 src/libsync/syncjournaldb.cpp           |  20 ++-
 src/libsync/syncjournalfilerecord.cpp   |   4 +-
 src/libsync/syncjournalfilerecord.h     |  11 +-
 src/libsync/utility.cpp                 |   4 +-
 test/CMakeLists.txt                     |   1 +
 test/owncloud_add_test.cmake            |   2 +-
 test/testfolderman.h                    |  35 ++++-
 91 files changed, 1660 insertions(+), 381 deletions(-)

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