[Pkg-owncloud-commits] [owncloud-client] 477/484: Merge tag 'upstream/2.1.0+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:38:25 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 2d981b31febe214de359e2a0b1df6281272e2ee9
Merge: 3b9f7fc bc191ff
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Dec 15 18:46:25 2015 +0100
Merge tag 'upstream/2.1.0+dfsg'
Upstream version 2.1.0+dfsg
.tag | 2 +-
CMakeLists.txt | 7 -
ChangeLog | 55 +-
README.md | 2 +-
VERSION.cmake | 4 +-
client.qrc | 2 +
cmake/modules/DefineInstallationPaths.cmake | 5 -
cmake/modules/FindNeon.cmake | 73 -
cmake/modules/GNUInstallDirs.cmake | 253 +++
cmake/modules/NSIS.template.in | 5 +
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 | 27 +-
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 | 14 +-
csync/src/csync_statedb.c | 59 +-
csync/src/csync_update.c | 140 +-
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 | 152 +-
csync/tests/CMakeLists.txt | 5 -
csync/tests/csync_tests/check_csync_exclude.c | 18 +-
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 -
doc/advancedusage.rst | 8 +-
doc/autoupdate.rst | 29 +-
doc/conf.py.in | 6 +-
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/menu.png | Bin 4969 -> 101298 bytes
doc/installing.rst | 6 +-
doc/introduction.rst | 7 +-
doc/logo-blue.pdf | Bin 1849 -> 1851 bytes
doc/navigating.rst | 128 +-
doc/owncloudcmd.1.rst | 6 +
doc/owncloudcmd.rst | 6 +
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 -
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 | 214 ++-
src/gui/accountsettings.h | 8 +-
src/gui/accountsettings.ui | 50 +-
src/gui/accountstate.cpp | 70 +-
src/gui/accountstate.h | 16 +-
src/gui/activityitemdelegate.cpp | 153 ++
...lderstatusdelegate.h => activityitemdelegate.h} | 40 +-
src/gui/activitywidget.cpp | 484 ++++++
src/gui/activitywidget.h | 202 +++
src/gui/activitywidget.ui | 45 +
src/gui/application.cpp | 45 +-
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 | 127 +-
src/gui/creds/shibbolethcredentials.h | 14 +-
src/gui/folder.cpp | 58 +-
src/gui/folder.h | 12 +-
src/gui/folderman.cpp | 90 +-
src/gui/folderman.h | 13 +-
src/gui/folderstatusdelegate.cpp | 47 +-
src/gui/folderstatusdelegate.h | 3 +-
src/gui/folderstatusmodel.cpp | 284 +++-
src/gui/folderstatusmodel.h | 41 +-
src/gui/folderwatcher.cpp | 88 +-
src/gui/folderwatcher.h | 26 +-
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/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 | 55 +-
src/gui/owncloudsetupwizard.cpp | 4 +-
src/gui/protocolwidget.cpp | 150 +-
src/gui/protocolwidget.h | 15 +-
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 | 114 +-
src/gui/settingsdialog.h | 12 +-
src/gui/settingsdialog.ui | 26 +-
src/gui/settingsdialogmac.cpp | 23 +-
src/gui/settingsdialogmac.h | 7 +-
src/gui/share.cpp | 315 ++++
src/gui/share.h | 277 ++++
src/gui/sharedialog.cpp | 756 +--------
src/gui/sharedialog.h | 104 +-
src/gui/sharedialog.ui | 210 +--
src/gui/sharee.cpp | 207 +++
src/gui/sharee.h | 89 ++
src/gui/sharelinkwidget.cpp | 529 +++++++
src/gui/sharelinkwidget.h | 115 ++
src/gui/{sharedialog.ui => sharelinkwidget.ui} | 222 ++-
src/gui/shareusergroupwidget.cpp | 373 +++++
src/gui/shareusergroupwidget.h | 129 ++
src/gui/shareusergroupwidget.ui | 56 +
src/gui/sharewidget.ui | 104 ++
src/gui/socketapi.cpp | 156 +-
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/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 | 12 +
src/gui/wizard/owncloudwizardresultpage.cpp | 2 +-
src/libsync/CMakeLists.txt | 20 +-
src/libsync/abstractnetworkjob.cpp | 14 +-
src/libsync/abstractnetworkjob.h | 7 +-
src/libsync/accessmanager.cpp | 3 +
src/libsync/account.cpp | 42 +-
src/libsync/account.h | 9 +-
src/libsync/bandwidthmanager.cpp | 4 +-
src/libsync/capabilities.cpp | 62 +-
src/libsync/capabilities.h | 22 +-
src/libsync/checksums.cpp | 195 +++
src/libsync/checksums.h | 138 ++
src/libsync/clientproxy.cpp | 33 -
src/libsync/clientproxy.h | 1 -
src/libsync/configfile.cpp | 6 +-
src/libsync/configfile.h | 2 +-
src/libsync/connectionvalidator.cpp | 32 +-
src/libsync/connectionvalidator.h | 18 +-
src/libsync/creds/abstractcredentials.h | 11 +-
src/libsync/creds/credentialscommon.cpp | 47 -
src/libsync/creds/credentialscommon.h | 7 -
src/libsync/creds/dummycredentials.cpp | 13 +-
src/libsync/creds/dummycredentials.h | 5 +-
src/libsync/creds/httpcredentials.cpp | 135 +-
src/libsync/creds/httpcredentials.h | 10 +-
src/libsync/creds/tokencredentials.cpp | 47 +-
src/libsync/creds/tokencredentials.h | 4 +-
src/libsync/discoveryphase.cpp | 45 +-
src/libsync/discoveryphase.h | 21 +-
src/libsync/excludedfiles.cpp | 80 +
src/libsync/excludedfiles.h | 74 +
src/libsync/filesystem.cpp | 64 +-
src/libsync/filesystem.h | 26 +-
src/libsync/logger.cpp | 33 +-
src/libsync/logger.h | 1 +
src/libsync/networkjobs.cpp | 128 +-
src/libsync/networkjobs.h | 65 +-
src/libsync/owncloudpropagator.cpp | 163 +-
src/libsync/owncloudpropagator.h | 70 +-
src/libsync/owncloudpropagator_p.h | 11 +-
src/libsync/ownsql.cpp | 7 +
src/libsync/ownsql.h | 3 +
src/libsync/progressdispatcher.cpp | 53 +-
src/libsync/progressdispatcher.h | 7 -
src/libsync/propagatedownload.cpp | 90 +-
src/libsync/propagatedownload.h | 7 +-
src/libsync/propagateremotedelete.cpp | 2 +-
src/libsync/propagateremotemkdir.cpp | 4 +-
src/libsync/propagateremotemove.cpp | 11 +-
src/libsync/propagateupload.cpp | 155 +-
src/libsync/propagateupload.h | 10 +-
src/libsync/propagator_legacy.cpp | 735 ---------
src/libsync/propagator_legacy.h | 161 --
src/libsync/propagatorjobs.cpp | 13 +-
src/libsync/propagatorjobs.h | 1 -
src/libsync/syncengine.cpp | 183 ++-
src/libsync/syncengine.h | 23 +-
src/libsync/syncfileitem.h | 19 +-
src/libsync/syncjournaldb.cpp | 218 ++-
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 | 1236 ++++++++-------
translations/client_cs.ts | 1238 ++++++++-------
translations/client_de.ts | 1242 ++++++++-------
translations/client_el.ts | 1240 ++++++++-------
translations/client_en.ts | 1163 ++++++++------
translations/client_es.ts | 1244 ++++++++-------
translations/client_es_AR.ts | 1198 ++++++++------
translations/client_et.ts | 1230 +++++++++------
translations/client_eu.ts | 1198 ++++++++------
translations/client_fa.ts | 1218 +++++++++------
translations/client_fi.ts | 1280 ++++++++-------
translations/client_fr.ts | 1246 ++++++++-------
translations/client_gl.ts | 1236 ++++++++-------
translations/client_hu.ts | 1228 +++++++++------
translations/client_it.ts | 1240 ++++++++-------
translations/client_ja.ts | 1320 +++++++++-------
translations/client_nb_NO.ts | 1240 ++++++++-------
translations/client_nl.ts | 1236 ++++++++-------
translations/client_pl.ts | 1230 +++++++++------
translations/client_pt.ts | 1242 ++++++++-------
translations/client_pt_BR.ts | 1242 ++++++++-------
translations/client_ru.ts | 1240 ++++++++-------
translations/client_sk.ts | 1236 ++++++++-------
translations/client_sl.ts | 1236 ++++++++-------
translations/client_sr.ts | 1232 ++++++++-------
translations/client_sv.ts | 1361 +++++++++-------
translations/client_th.ts | 1252 ++++++++-------
translations/client_tr.ts | 1300 +++++++++-------
translations/client_uk.ts | 1226 +++++++++------
translations/client_zh_CN.ts | 1240 ++++++++-------
translations/client_zh_TW.ts | 1628 +++++++++++---------
286 files changed, 31377 insertions(+), 24551 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