[Pkg-owncloud-commits] [owncloud-client] 494/498: Merge tag 'upstream/2.0.0_beta1+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:22 UTC 2015
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 9927811d211f8fa6aee3c342bf7d15d6dfc5e7d8
Merge: 74e2653 614445a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Aug 11 14:46:01 2015 +0200
Merge tag 'upstream/2.0.0_beta1+dfsg'
Upstream version 2.0.0~beta1+dfsg
# gpg: Signature made Di 11 Aug 2015 14:46:01 CEST using RSA key ID 50605636
# gpg: Good signature from "Sandro Knauß <bugs at sandroknauss.de>"
.gitmodules | 2 +-
.tag | 2 +-
.travis.yml | 31 +
CMakeLists.txt | 14 +-
CONTRIBUTING.md | 1 +
ChangeLog | 32 +-
OwnCloudCPack.cmake | 8 +-
README.md | 8 +-
VERSION.cmake | 8 +-
binary.rej | 5 +
cmake/modules/AddCMockaTest.cmake | 11 +
cmake/modules/MacOSXBundleInfo.plist.in | 2 +-
cmake/modules/NSIS.template.in | 145 +-
config.h.in | 5 +-
csync/config_csync.h.cmake | 1 -
csync/src/CMakeLists.txt | 12 +-
csync/src/csync.c | 6 +-
csync/src/csync.h | 68 +-
csync/src/csync_exclude.c | 4 +-
csync/src/csync_exclude.h | 3 +-
csync/src/csync_misc.c | 6 +-
csync/src/csync_private.h | 14 +-
csync/src/csync_reconcile.c | 27 +-
csync/src/csync_statedb.c | 6 +-
csync/src/csync_update.c | 116 +-
csync/src/csync_util.c | 24 -
csync/src/csync_util.h | 2 -
csync/src/std/c_path.c | 59 +
csync/src/std/c_path.h | 32 +-
csync/src/std/c_private.h | 14 +-
csync/src/std/c_string.c | 37 +-
csync/src/std/c_string.h | 6 +-
csync/src/std/c_time.c | 6 +-
.../{csync_vio_local.c => csync_vio_local_unix.c} | 165 +-
.../{csync_vio_local.c => csync_vio_local_win.c} | 202 +-
csync/tests/CMakeLists.txt | 4 +
csync/tests/csync_tests/check_csync_log.c | 2 +-
csync/tests/csync_tests/check_csync_statedb_load.c | 2 +-
csync/tests/csync_tests/check_csync_update.c | 45 +-
csync/tests/encoding_tests/check_encoding.c | 41 +-
csync/tests/ownCloud/t4.pl | 53 +-
csync/tests/vio_tests/check_vio.c | 4 +-
csync/tests/vio_tests/check_vio_ext.c | 474 ++++
doc/architecture.rst | 2 +-
doc/conffile.rst | 2 +-
doc/dev/CMakeLists.txt | 11 +
doc/dev/Doxyfile.in | 2307 ++++++++++++++++++++
doc/dev/main-page.md | 5 +
doc/installing.rst | 2 +-
issue_template.md | 2 +-
shell_integration/icons/128x128/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/32x32/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/512x512/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/CMakeLists.txt | 12 -
.../icons/nopadding/SVG/attention.svg | 32 +
shell_integration/icons/nopadding/SVG/error.svg | 36 +
shell_integration/icons/nopadding/SVG/ok.svg | 23 +
shell_integration/icons/nopadding/SVG/shared.svg | 62 +
shell_integration/icons/nopadding/SVG/sync.svg | 55 +
.../icons/nopadding/error.iconset/icon_128x128.png | Bin 0 -> 5541 bytes
.../nopadding/error.iconset/icon_128x128 at 2x.png | Bin 0 -> 11767 bytes
.../icons/nopadding/error.iconset/icon_16x16.png | Bin 0 -> 603 bytes
.../nopadding/error.iconset/icon_16x16 at 2x.png | Bin 0 -> 1257 bytes
.../icons/nopadding/error.iconset/icon_256x256.png | Bin 0 -> 11689 bytes
.../nopadding/error.iconset/icon_256x256 at 2x.png | Bin 0 -> 25593 bytes
.../icons/nopadding/error.iconset/icon_32x32.png | Bin 0 -> 1255 bytes
.../nopadding/error.iconset/icon_32x32 at 2x.png | Bin 0 -> 2506 bytes
.../icons/nopadding/ok.iconset/icon_128x128.png | Bin 0 -> 6666 bytes
.../icons/nopadding/ok.iconset/icon_128x128 at 2x.png | Bin 0 -> 14441 bytes
.../icons/nopadding/ok.iconset/icon_16x16.png | Bin 0 -> 615 bytes
.../icons/nopadding/ok.iconset/icon_16x16 at 2x.png | Bin 0 -> 1243 bytes
.../icons/nopadding/ok.iconset/icon_256x256.png | Bin 0 -> 14634 bytes
.../icons/nopadding/ok.iconset/icon_256x256 at 2x.png | Bin 0 -> 31427 bytes
.../icons/nopadding/ok.iconset/icon_32x32.png | Bin 0 -> 1243 bytes
.../icons/nopadding/ok.iconset/icon_32x32 at 2x.png | Bin 0 -> 2722 bytes
.../nopadding/ok_swm.iconset/icon_128x128.png | Bin 0 -> 7492 bytes
.../nopadding/ok_swm.iconset/icon_128x128 at 2x.png | Bin 0 -> 16248 bytes
.../icons/nopadding/ok_swm.iconset/icon_16x16.png | Bin 0 -> 647 bytes
.../nopadding/ok_swm.iconset/icon_16x16 at 2x.png | Bin 0 -> 1452 bytes
.../nopadding/ok_swm.iconset/icon_256x256.png | Bin 0 -> 16286 bytes
.../nopadding/ok_swm.iconset/icon_256x256 at 2x.png | Bin 0 -> 35262 bytes
.../icons/nopadding/ok_swm.iconset/icon_32x32.png | Bin 0 -> 1462 bytes
.../nopadding/ok_swm.iconset/icon_32x32 at 2x.png | Bin 0 -> 3267 bytes
.../icons/nopadding/sync.iconset/icon_128x128.png | Bin 0 -> 7701 bytes
.../nopadding/sync.iconset/icon_128x128 at 2x.png | Bin 0 -> 16662 bytes
.../icons/nopadding/sync.iconset/icon_16x16.png | Bin 0 -> 694 bytes
.../icons/nopadding/sync.iconset/icon_16x16 at 2x.png | Bin 0 -> 1522 bytes
.../icons/nopadding/sync.iconset/icon_256x256.png | Bin 0 -> 16662 bytes
.../nopadding/sync.iconset/icon_256x256 at 2x.png | Bin 0 -> 35628 bytes
.../icons/nopadding/sync.iconset/icon_32x32.png | Bin 0 -> 1563 bytes
.../icons/nopadding/sync.iconset/icon_32x32 at 2x.png | Bin 0 -> 3459 bytes
.../nopadding/warning.iconset/icon_128x128.png | Bin 0 -> 6039 bytes
.../nopadding/warning.iconset/icon_128x128 at 2x.png | Bin 0 -> 12859 bytes
.../icons/nopadding/warning.iconset/icon_16x16.png | Bin 0 -> 523 bytes
.../nopadding/warning.iconset/icon_16x16 at 2x.png | Bin 0 -> 1082 bytes
.../nopadding/warning.iconset/icon_256x256.png | Bin 0 -> 12859 bytes
.../nopadding/warning.iconset/icon_256x256 at 2x.png | Bin 0 -> 27637 bytes
.../icons/nopadding/warning.iconset/icon_32x32.png | Bin 0 -> 1082 bytes
.../nopadding/warning.iconset/icon_32x32 at 2x.png | Bin 0 -> 2582 bytes
shell_integration/nautilus/syncstate.py | 26 +-
src/CMakeLists.txt | 4 +
src/cmd/cmd.cpp | 53 +-
src/cmd/cmd.h | 5 +-
src/cmd/cmd.md | 4 +
src/cmd/netrcparser.h | 4 +
src/cmd/simplesslerrorhandler.cpp | 4 +
src/cmd/simplesslerrorhandler.h | 8 +
src/gui/CMakeLists.txt | 22 +-
src/gui/accountmanager.cpp | 269 +++
src/gui/accountmanager.h | 91 +
src/gui/accountmigrator.h | 4 +
src/gui/accountsettings.cpp | 708 ++----
src/gui/accountsettings.h | 50 +-
src/gui/accountsettings.ui | 244 ++-
src/gui/accountstate.cpp | 96 +-
src/gui/accountstate.h | 43 +-
src/gui/addcertificatedialog.h | 4 +
src/gui/application.cpp | 230 +-
src/gui/application.h | 21 +-
src/{libsync => gui}/authenticationdialog.cpp | 0
src/{libsync => gui}/authenticationdialog.h | 5 +-
src/gui/cocoainitializer.h | 5 +-
src/{libsync => gui}/creds/credentialsfactory.cpp | 12 +-
src/{libsync => gui}/creds/credentialsfactory.h | 7 +-
src/gui/creds/httpcredentialsgui.cpp | 46 +
.../creds/httpcredentialsgui.h} | 24 +-
.../creds/shibboleth/shibbolethrefresher.cpp | 0
.../creds/shibboleth/shibbolethrefresher.h | 4 +
.../creds/shibboleth/shibbolethuserjob.cpp | 0
.../creds/shibboleth/shibbolethuserjob.h | 5 +-
.../creds/shibboleth/shibbolethwebview.cpp | 0
.../creds/shibboleth/shibbolethwebview.h | 6 +-
.../creds/shibbolethcredentials.cpp | 10 +-
src/{libsync => gui}/creds/shibbolethcredentials.h | 6 +-
src/gui/folder.cpp | 358 +--
src/gui/folder.h | 91 +-
src/gui/folderman.cpp | 524 +++--
src/gui/folderman.h | 93 +-
src/gui/folderstatusdelegate.cpp | 335 +++
...{folderstatusmodel.h => folderstatusdelegate.h} | 30 +-
src/gui/folderstatusmodel.cpp | 1043 ++++++---
src/gui/folderstatusmodel.h | 124 +-
src/gui/folderwatcher.cpp | 25 +-
src/gui/folderwatcher.h | 11 +-
src/gui/folderwatcher_linux.h | 5 +
src/gui/folderwatcher_mac.cpp | 6 +-
src/gui/folderwatcher_mac.h | 4 +
src/gui/folderwatcher_qt.h | 4 +
src/gui/folderwatcher_win.cpp | 4 +-
src/gui/folderwatcher_win.h | 10 +-
src/gui/folderwizard.cpp | 79 +-
src/gui/folderwizard.h | 19 +-
src/gui/generalsettings.cpp | 41 +-
src/gui/generalsettings.h | 12 +-
src/gui/generalsettings.ui | 135 +-
src/gui/gui.md | 5 +
src/gui/ignorelisteditor.cpp | 136 +-
src/gui/ignorelisteditor.h | 9 +-
src/gui/ignorelisteditor.ui | 158 +-
src/gui/logbrowser.h | 8 +
src/gui/main.cpp | 9 +
src/gui/networksettings.cpp | 55 +-
src/gui/networksettings.h | 5 +
src/gui/networksettings.ui | 105 +-
src/gui/openfilemanager.h | 5 +-
src/gui/owncloudgui.cpp | 407 ++--
src/gui/owncloudgui.h | 28 +-
src/gui/owncloudsetupwizard.cpp | 85 +-
src/gui/owncloudsetupwizard.h | 14 +-
src/gui/protocolwidget.cpp | 12 +-
src/gui/protocolwidget.h | 8 +-
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/quotainfo.cpp | 66 +-
src/gui/quotainfo.h | 43 +-
src/gui/selectivesyncdialog.cpp | 17 +-
src/gui/selectivesyncdialog.h | 8 +
src/gui/settingsdialog.cpp | 88 +-
src/gui/settingsdialog.h | 11 +-
src/gui/settingsdialogmac.cpp | 75 +-
src/gui/settingsdialogmac.h | 18 +-
src/gui/sharedialog.cpp | 90 +-
src/gui/sharedialog.h | 25 +-
src/gui/socketapi.cpp | 95 +-
src/gui/socketapi.h | 40 +-
src/gui/socketapisocket_mac.h | 69 +
src/gui/socketapisocket_mac.mm | 225 ++
src/gui/sslbutton.cpp | 23 +-
src/gui/sslbutton.h | 5 +
src/gui/sslerrordialog.h | 8 +
src/gui/syncrunfilelog.h | 4 +
src/gui/systray.h | 4 +
src/gui/updater/ocupdater.cpp | 112 +-
src/gui/updater/ocupdater.h | 84 +-
src/gui/updater/sparkleupdater_mac.mm | 2 +-
src/gui/updater/updater.cpp | 6 +
src/gui/updater/updater.h | 2 +
src/gui/wizard/abstractcredswizardpage.cpp | 7 +-
src/gui/wizard/abstractcredswizardpage.h | 4 +
src/gui/wizard/owncloudadvancedsetuppage.cpp | 61 +-
src/gui/wizard/owncloudadvancedsetuppage.h | 10 +-
src/gui/wizard/owncloudconnectionmethoddialog.cpp | 4 +
src/gui/wizard/owncloudconnectionmethoddialog.h | 8 +
src/gui/wizard/owncloudconnectionmethoddialog.ui | 4 +-
src/gui/wizard/owncloudhttpcredspage.cpp | 11 +-
src/gui/wizard/owncloudhttpcredspage.h | 5 +-
src/gui/wizard/owncloudsetuppage.cpp | 9 -
src/gui/wizard/owncloudsetuppage.h | 6 +-
src/gui/wizard/owncloudshibbolethcredspage.h | 4 +
src/gui/wizard/owncloudwizard.cpp | 21 +-
src/gui/wizard/owncloudwizard.h | 10 +-
src/gui/wizard/owncloudwizardresultpage.h | 4 +
src/libsync/CMakeLists.txt | 21 +-
src/libsync/abstractnetworkjob.cpp | 285 +++
src/libsync/abstractnetworkjob.h | 130 ++
src/libsync/accessmanager.cpp | 51 +-
src/libsync/accessmanager.h | 8 +-
src/libsync/account.cpp | 214 +-
src/libsync/account.h | 57 +-
src/libsync/accountfwd.h | 2 +
src/libsync/bandwidthmanager.h | 4 +
src/libsync/capabilities.cpp | 41 +
src/libsync/capabilities.h | 44 +
src/libsync/clientproxy.h | 4 +
src/libsync/configfile.cpp | 47 +-
src/libsync/configfile.h | 21 +-
src/libsync/connectionvalidator.cpp | 1 -
src/libsync/connectionvalidator.h | 3 +-
src/libsync/cookiejar.h | 4 +
src/libsync/creds/credentialscommon.h | 4 +-
src/libsync/creds/dummycredentials.h | 2 +-
src/libsync/creds/httpcredentials.cpp | 92 +-
src/libsync/creds/httpcredentials.h | 13 +-
src/libsync/discoveryphase.cpp | 172 +-
src/libsync/discoveryphase.h | 51 +-
src/libsync/filesystem.cpp | 52 +-
src/libsync/filesystem.h | 43 +-
src/libsync/libsync.md | 5 +
src/libsync/logger.h | 4 +
src/libsync/networkjobs.cpp | 320 +--
src/libsync/networkjobs.h | 134 +-
src/libsync/owncloudpropagator.cpp | 138 +-
src/libsync/owncloudpropagator.h | 48 +-
src/libsync/owncloudpropagator_p.h | 8 +-
src/libsync/owncloudtheme.h | 4 +
src/libsync/ownsql.cpp | 10 +-
src/libsync/ownsql.h | 9 +-
src/libsync/progressdispatcher.cpp | 191 +-
src/libsync/progressdispatcher.h | 285 +--
src/libsync/propagatedownload.cpp | 126 +-
src/libsync/propagatedownload.h | 11 +-
src/libsync/propagateremotedelete.cpp | 18 +-
src/libsync/propagateremotedelete.h | 12 +-
src/libsync/propagateremotemkdir.cpp | 28 +-
src/libsync/propagateremotemkdir.h | 8 +-
src/libsync/propagateremotemove.cpp | 32 +-
src/libsync/propagateremotemove.h | 11 +-
src/libsync/propagateupload.cpp | 156 +-
src/libsync/propagateupload.h | 28 +-
src/libsync/propagator_legacy.cpp | 122 +-
src/libsync/propagator_legacy.h | 22 +-
src/libsync/propagatorjobs.cpp | 55 +-
src/libsync/propagatorjobs.h | 19 +-
src/libsync/syncengine.cpp | 472 ++--
src/libsync/syncengine.h | 26 +-
src/libsync/syncfileitem.h | 20 +-
src/libsync/syncfilestatus.h | 4 +
src/libsync/syncjournaldb.cpp | 85 +-
src/libsync/syncjournaldb.h | 22 +-
src/libsync/syncjournalfilerecord.cpp | 8 +-
src/libsync/syncjournalfilerecord.h | 15 +-
src/libsync/syncresult.h | 4 +
src/libsync/theme.cpp | 9 +
src/libsync/theme.h | 14 +-
src/libsync/transmissionchecksumvalidator.h | 4 +
src/libsync/utility.cpp | 133 +-
src/libsync/utility.h | 19 +-
src/libsync/utility_mac.cpp | 1 +
src/libsync/version.h.in | 2 +
sync-exclude.lst | 7 +-
test/CMakeLists.txt | 26 +
test/mockserver/CMakeLists.txt | 21 +
test/mockserver/httpserver.cpp | 63 +
.../accountfwd.h => test/mockserver/httpserver.h | 22 +-
.../accountfwd.h => test/mockserver/main.cpp | 19 +-
test/oc_bin.h.in | 3 +
test/owncloud_add_test.cmake | 2 +-
test/stub.cpp | 5 +
test/testfolderman.h | 121 +
test/testtranschecksumvalidator.h | 40 +-
test/testutility.h | 85 +-
translations/client_ca.ts | 1336 +++++++-----
translations/client_cs.ts | 1343 +++++++-----
translations/client_de.ts | 1340 +++++++-----
translations/client_el.ts | 1347 +++++++-----
translations/client_en.ts | 1232 +++++++----
translations/client_es.ts | 1345 +++++++-----
translations/client_es_AR.ts | 1306 ++++++-----
translations/client_et.ts | 1414 +++++++-----
translations/client_eu.ts | 1322 ++++++-----
translations/client_fa.ts | 1266 ++++++-----
translations/client_fi.ts | 1323 ++++++-----
translations/client_fr.ts | 1346 +++++++-----
translations/client_gl.ts | 1349 +++++++-----
translations/client_hu.ts | 1276 ++++++-----
translations/client_it.ts | 1347 +++++++-----
translations/client_ja.ts | 1388 +++++++-----
translations/client_nb_NO.ts | 1344 +++++++-----
translations/client_nl.ts | 1342 +++++++-----
translations/client_pl.ts | 1336 +++++++-----
translations/client_pt.ts | 1344 +++++++-----
translations/client_pt_BR.ts | 1344 +++++++-----
translations/client_ru.ts | 1340 +++++++-----
translations/client_sk.ts | 1368 +++++++-----
translations/client_sl.ts | 1338 +++++++-----
translations/client_sr.ts | 1340 +++++++-----
translations/client_sv.ts | 1328 ++++++-----
translations/client_th.ts | 1336 +++++++-----
translations/client_tr.ts | 1340 +++++++-----
translations/client_uk.ts | 1340 +++++++-----
translations/client_zh_CN.ts | 1342 +++++++-----
translations/client_zh_TW.ts | 1294 ++++++-----
325 files changed, 36623 insertions(+), 21320 deletions(-)
--
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