[Pkg-owncloud-commits] [owncloud-client] 05/470: Merge remote-tracking branch 'origin/2.1'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu May 12 16:24:37 UTC 2016
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 895f0b29aac4a72ab706684bef527a0577c882da
Merge: 40395bd 4994009
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Mon Nov 30 00:47:10 2015 +0100
Merge remote-tracking branch 'origin/2.1'
ChangeLog | 50 +-
...n-Mac-OS-if-PAC-URL-contains-non-URL-lega.patch | 42 ++
...ble-crash-when-passing-an-invalid-PAC-URL.patch | 38 ++
...f-PAC-script-retrieval-returns-a-null-CFD.patch | 39 ++
.../patches/0004-Cocoa-Fix-systray-SVG-icons.patch | 32 +
.../0005-OSX-Fix-disapearing-tray-icon.patch | 115 ++++
...rce-debug-info-with-macx-clang_NOUPSTREAM.patch | 30 +
...load-corruptions-when-server-closes-conne.patch | 691 ++++++++++++++++++++
...-Network-Fix-up-previous-corruption-patch.patch | 434 +++++++++++++
...ply-deadlocks-on-server-closing-connectio.patch | 64 ++
...-proper-channel-before-sslErrors-emission.patch | 33 +
...losed-http-sockets-pass-as-valid-connecti.patch | 121 ++++
...re-to-report-correct-NetworkAccessibility.patch | 113 ++++
...re-networkAccessibilityChanged-is-emitted.patch | 233 +++++++
...e-UnknownAccessibility-not-block-requests.patch | 52 ++
...cy-platform-code-in-QSslSocket-for-OS-X-1.patch | 153 +++++
...t-evaluate-CAs-in-all-keychain-categories.patch | 279 ++++++++
...it-system-proxy-if-internet-settings-chan.patch | 152 +++++
...not-crash-if-SSL-context-is-gone-after-ro.patch | 32 +
admin/qt/patches/README.md | 46 ++
admin/win/nsi/l10n/Hungarian.nsh | 32 +-
admin/win/nsi/l10n/SpanishInternational.nsh | 24 +-
cmake/modules/QtVersionAbstraction.cmake | 19 +-
csync/src/csync.c | 3 +
csync/src/csync.h | 11 +-
csync/src/csync_macros.h | 1 +
csync/src/csync_private.h | 8 +
csync/src/csync_statedb.c | 15 +-
csync/src/csync_update.c | 91 ++-
csync/tests/csync_tests/check_csync_update.c | 6 +
csync/tests/ownCloud/ownCloud/Test.pm | 28 +-
csync/tests/ownCloud/t9.pl | 91 +++
doc/owncloudcmd.1.rst | 6 +
doc/owncloudcmd.rst | 6 +
shell_integration/CMakeLists.txt | 14 +-
.../dolphin/ownclouddolphinactionplugin.cpp | 2 +-
.../dolphin/ownclouddolphinoverlayplugin.cpp | 2 +-
shell_integration/nautilus/syncstate.py | 8 +-
src/3rdparty/qtmacgoodies | 2 +-
src/cmd/cmd.cpp | 21 +
src/gui/accountsettings.cpp | 11 -
src/gui/accountstate.cpp | 19 +
src/gui/accountstate.h | 9 +
src/gui/activitywidget.cpp | 69 +-
src/gui/activitywidget.h | 15 +-
src/gui/activitywidget.ui | 7 +
src/gui/application.cpp | 17 +-
src/gui/application.h | 3 +
src/gui/creds/shibboleth/shibbolethuserjob.cpp | 7 +-
src/gui/creds/shibboleth/shibbolethuserjob.h | 2 +-
src/gui/folder.cpp | 5 +
src/gui/folderman.cpp | 22 +-
src/gui/folderman.h | 2 +-
src/gui/folderstatusmodel.cpp | 19 +-
src/gui/folderwizardtargetpage.ui | 15 +-
src/gui/ocssharejob.cpp | 4 +-
src/gui/owncloudgui.cpp | 2 +-
src/gui/settingsdialog.cpp | 9 +-
src/gui/settingsdialogmac.cpp | 1 -
src/gui/share.h | 13 +-
src/gui/sharedialog.cpp | 22 +-
src/gui/sharedialog.ui | 6 -
src/gui/sharee.cpp | 2 +-
src/gui/sharee.h | 4 +-
src/gui/sharelinkwidget.cpp | 7 +-
src/gui/shareusergroupwidget.cpp | 112 ++--
src/gui/shareusergroupwidget.h | 13 +-
src/gui/shareusergroupwidget.ui | 3 -
src/gui/sharewidget.ui | 48 +-
src/libsync/CMakeLists.txt | 2 +-
src/libsync/abstractnetworkjob.h | 2 +
src/libsync/account.cpp | 9 +
src/libsync/account.h | 1 +
src/libsync/capabilities.cpp | 2 +-
...smissionchecksumvalidator.cpp => checksums.cpp} | 73 ++-
...transmissionchecksumvalidator.h => checksums.h} | 32 +
src/libsync/connectionvalidator.cpp | 8 +-
src/libsync/connectionvalidator.h | 3 +
src/libsync/discoveryphase.cpp | 4 +-
src/libsync/filesystem.cpp | 13 +
src/libsync/filesystem.h | 11 +
src/libsync/networkjobs.cpp | 100 ++-
src/libsync/networkjobs.h | 49 +-
src/libsync/propagatedownload.cpp | 20 +-
src/libsync/propagatedownload.h | 2 +-
src/libsync/propagateremotemove.cpp | 4 +-
src/libsync/propagateupload.cpp | 90 ++-
src/libsync/propagateupload.h | 6 +-
src/libsync/propagatorjobs.cpp | 7 +-
src/libsync/syncengine.cpp | 55 +-
src/libsync/syncengine.h | 11 +
src/libsync/syncfileitem.h | 4 +-
src/libsync/syncjournaldb.cpp | 89 ++-
src/libsync/syncjournaldb.h | 10 +-
src/libsync/syncjournalfilerecord.cpp | 23 +-
src/libsync/syncjournalfilerecord.h | 4 +-
src/libsync/theme.cpp | 5 +
src/libsync/theme.h | 1 +
test/CMakeLists.txt | 2 +-
test/test_journal.db | Bin 57344 -> 57344 bytes
...checksumvalidator.h => testchecksumvalidator.h} | 4 +-
test/testsyncjournaldb.h | 27 +-
translations/client_ca.ts | 552 ++++++++--------
translations/client_cs.ts | 606 ++++++++---------
translations/client_de.ts | 604 +++++++++--------
translations/client_el.ts | 552 ++++++++--------
translations/client_en.ts | 520 ++++++++-------
translations/client_es.ts | 552 ++++++++--------
translations/client_es_AR.ts | 550 ++++++++--------
translations/client_et.ts | 552 ++++++++--------
translations/client_eu.ts | 550 ++++++++--------
translations/client_fa.ts | 546 ++++++++--------
translations/client_fi.ts | 616 +++++++++---------
translations/client_fr.ts | 612 +++++++++---------
translations/client_gl.ts | 552 ++++++++--------
translations/client_hu.ts | 552 ++++++++--------
translations/client_it.ts | 606 ++++++++---------
translations/client_ja.ts | 604 +++++++++--------
translations/client_nb_NO.ts | 550 ++++++++--------
translations/client_nl.ts | 580 +++++++++--------
translations/client_pl.ts | 552 ++++++++--------
translations/client_pt.ts | 572 ++++++++--------
translations/client_pt_BR.ts | 600 +++++++++--------
translations/client_ru.ts | 552 ++++++++--------
translations/client_sk.ts | 552 ++++++++--------
translations/client_sl.ts | 552 ++++++++--------
translations/client_sr.ts | 550 ++++++++--------
translations/client_sv.ts | 552 ++++++++--------
translations/client_th.ts | 596 +++++++++--------
translations/client_tr.ts | 718 +++++++++++----------
translations/client_uk.ts | 552 ++++++++--------
translations/client_zh_CN.ts | 548 ++++++++--------
translations/client_zh_TW.ts | 548 ++++++++--------
133 files changed, 13188 insertions(+), 8792 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