[Pkg-owncloud-commits] [owncloud-client] 158/164: Merge tag 'upstream/1.8.0+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sun Mar 22 11:57:10 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 a3aa1140c55511992c46a8cdd1e48a78147a5837
Merge: 644868c 3f0223f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Sun Mar 22 10:54:47 2015 +0100
Merge tag 'upstream/1.8.0+dfsg'
Upstream version 1.8.0+dfsg
# gpg: Unterschrift vom So 22 Mär 2015 10:54:35 CET mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.tag | 2 +-
CMakeLists.txt | 5 +
ChangeLog | 40 +-
OWNCLOUD.cmake | 2 +-
VERSION.cmake | 2 +-
client.qrc | 2 +-
cmake/modules/GetGitRevisionDescription.cmake | 9 +-
cmake/modules/NSIS.template.in | 11 +-
cmake/modules/Warnings.cmake | 20 +-
csync/src/csync.c | 9 -
csync/src/csync.h | 4 +-
csync/src/csync_exclude.c | 19 +-
csync/src/csync_exclude.h | 3 +-
csync/src/csync_macros.h | 1 +
csync/src/csync_misc.c | 3 +
csync/src/csync_update.c | 8 +-
csync/src/vio/csync_vio.c | 2 +-
doc/architecture.rst | 72 +-
doc/building.rst | 49 +-
doc/installing.rst | 2 +-
resources/account.png | Bin 0 -> 2777 bytes
resources/account.svg | 10 +
resources/accounts.png | Bin 4378 -> 0 bytes
resources/activity.png | Bin 1433 -> 1993 bytes
resources/activity.svg | 10 +
resources/lock-http.png | Bin 739 -> 479 bytes
resources/lock-http.svg | 5 +
resources/lock-http at 2x.png | Bin 2141 -> 583 bytes
resources/lock-https.png | Bin 478 -> 291 bytes
resources/lock-https.svg | 4 +
resources/lock-https at 2x.png | Bin 731 -> 375 bytes
resources/network.png | Bin 1083 -> 1459 bytes
resources/network.svg | 10 +
resources/settings.png | Bin 2754 -> 3677 bytes
resources/settings.svg | 14 +
shell_integration/nautilus/syncstate.py | 8 +-
src/crashreporter/CMakeLists.txt | 12 +
src/gui/accountsettings.cpp | 14 +-
src/gui/accountstate.cpp | 10 +
src/gui/accountstate.h | 5 +
src/gui/addcertificatedialog.cpp | 14 +
src/gui/addcertificatedialog.h | 14 +
src/gui/application.cpp | 35 +-
src/gui/application.h | 9 +-
src/gui/folder.cpp | 13 +-
src/gui/folder.h | 2 +-
src/gui/folderman.cpp | 99 ++-
src/gui/folderman.h | 9 +-
src/gui/folderwizard.cpp | 133 +++-
src/gui/folderwizard.h | 6 +
src/gui/folderwizardtargetpage.ui | 7 +-
src/gui/logbrowser.cpp | 4 +-
src/gui/main.cpp | 24 +-
src/gui/owncloudgui.cpp | 10 +-
src/gui/owncloudgui.h | 2 +-
src/gui/owncloudsetupwizard.cpp | 30 +-
src/gui/owncloudsetupwizard.h | 11 -
src/gui/protocolwidget.cpp | 47 +-
src/gui/protocolwidget.ui | 6 +-
src/gui/selectivesyncdialog.cpp | 1 +
src/gui/settingsdialog.cpp | 5 +-
src/gui/settingsdialogmac.cpp | 7 +
src/gui/sharedialog.cpp | 230 +++++--
src/gui/sharedialog.h | 17 +-
src/gui/sharedialog.ui | 220 +++---
src/gui/socketapi.cpp | 65 +-
src/gui/socketapi.h | 4 +-
src/gui/sslbutton.cpp | 5 +-
src/gui/syncrunfilelog.cpp | 2 +-
src/gui/wizard/owncloudadvancedsetuppage.cpp | 2 +-
src/gui/wizard/owncloudconnectionmethoddialog.cpp | 14 +
src/gui/wizard/owncloudconnectionmethoddialog.h | 14 +
src/gui/wizard/owncloudsetuppage.cpp | 4 +-
src/gui/wizard/owncloudwizard.h | 2 +-
src/gui/wizard/owncloudwizardresultpage.cpp | 3 +-
src/libsync/CMakeLists.txt | 5 +-
src/libsync/account.cpp | 49 +-
src/libsync/account.h | 3 +-
src/libsync/connectionvalidator.cpp | 24 +-
src/libsync/connectionvalidator.h | 1 +
src/libsync/creds/shibboleth/shibbolethwebview.cpp | 17 +-
src/libsync/creds/tokencredentials.cpp | 9 +-
src/libsync/discoveryphase.cpp | 92 ++-
src/libsync/discoveryphase.h | 27 +-
src/libsync/filesystem.cpp | 150 ++++-
src/libsync/filesystem.h | 29 +-
src/libsync/logger.cpp | 23 +-
src/libsync/logger.h | 1 +
src/libsync/networkjobs.cpp | 64 +-
src/libsync/networkjobs.h | 36 +-
src/libsync/owncloudpropagator.cpp | 4 +-
src/libsync/owncloudtheme.cpp | 3 +-
src/libsync/progressdispatcher.cpp | 3 +-
src/libsync/propagatedownload.cpp | 21 +-
src/libsync/propagatedownload.h | 4 +-
src/libsync/propagateremotedelete.cpp | 10 +-
src/libsync/propagateremotemkdir.cpp | 8 +-
src/libsync/propagateremotemove.cpp | 14 +-
src/libsync/propagateupload.cpp | 105 +--
src/libsync/propagateupload.h | 23 +-
src/libsync/propagator_legacy.cpp | 6 +-
src/libsync/propagatorjobs.cpp | 17 +-
src/libsync/syncengine.cpp | 74 ++-
src/libsync/syncengine.h | 4 +-
src/libsync/syncfileitem.h | 65 +-
src/libsync/theme.cpp | 27 +-
src/libsync/theme.h | 3 +
src/libsync/utility.cpp | 30 +-
src/libsync/utility.h | 5 -
test/CMakeLists.txt | 1 +
test/testconcaturl.h | 106 +++
test/testsyncfileitem.h | 4 +
translations/client_cs.ts | 44 +-
translations/client_el.ts | 54 +-
translations/client_es.ts | 39 +-
translations/client_es_AR.ts | 2 +-
translations/client_fr.ts | 24 +-
translations/client_gl.ts | 2 +-
translations/client_ja.ts | 52 +-
translations/client_nl.ts | 10 +-
translations/client_pl.ts | 44 +-
translations/client_ru.ts | 4 +-
translations/client_sl.ts | 34 +-
translations/client_sv.ts | 28 +-
translations/client_tr.ts | 10 +-
translations/client_uk.ts | 2 +-
translations/client_zh_CN.ts | 253 +++----
translations/client_zh_TW.ts | 268 ++++----
translations/mirall_en.ts | 739 +++++++++++----------
129 files changed, 2573 insertions(+), 1540 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