[Pkg-owncloud-commits] [owncloud-client] 112/115: Merge tag 'upstream/1.7.0_beta1+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Aug 29 22:04:08 UTC 2014
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 f5a02783e869515bd4fc6a7d26c08ac683333386
Merge: 4ac1b96 388afe9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Fri Aug 29 23:41:03 2014 +0200
Merge tag 'upstream/1.7.0_beta1+dfsg'
Upstream version 1.7.0~beta1+dfsg
# gpg: Unterschrift vom Fr 29 Aug 2014 23:41:02 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.gitmodules | 2 +-
.tag | 2 +-
VERSION.cmake | 2 +-
cmake/modules/NSIS.template.in | 71 +--
cmake/modules/Warnings.cmake | 4 +-
csync/src/csync.c | 2 +-
csync/src/csync.h | 20 +-
csync/src/csync_exclude.c | 49 +-
csync/src/csync_exclude.h | 10 +-
csync/src/csync_owncloud.c | 9 +
csync/src/csync_owncloud_recursive_propfind.c | 14 +
csync/src/csync_private.h | 6 +
csync/src/csync_statedb.c | 31 +-
csync/src/csync_update.c | 1 +
csync/src/csync_util.c | 4 +-
csync/src/vio/csync_vio.c | 3 +
csync/tests/csync_tests/check_csync_exclude.c | 31 +-
csync/tests/ownCloud/ownCloud/Test.pm | 6 +-
mirall.qrc | 1 -
shell_integration/nautilus/ownCloud.py | 75 +++-
src/CMakeLists.txt | 5 +-
src/creds/shibbolethcredentials.cpp | 20 -
src/creds/shibbolethcredentials.h | 1 -
src/mirall/accountsettings.cpp | 207 ++++++---
src/mirall/accountsettings.h | 5 +-
src/mirall/accountsettings.ui | 7 +
src/mirall/application.cpp | 7 +-
.../shibboleth => mirall}/authenticationdialog.cpp | 0
.../shibboleth => mirall}/authenticationdialog.h | 0
src/mirall/discoveryphase.cpp | 98 ++++
src/mirall/discoveryphase.h | 66 +++
src/mirall/folder.cpp | 28 +-
src/mirall/folder.h | 12 +-
src/mirall/folderman.cpp | 183 ++++----
src/mirall/folderman.h | 16 +-
src/mirall/folderstatusmodel.cpp | 5 +-
src/mirall/folderstatusmodel.h | 3 +-
src/mirall/folderwizard.cpp | 50 ++-
src/mirall/folderwizard.h | 25 +-
src/mirall/generalsettings.cpp | 1 +
src/mirall/mirallaccessmanager.cpp | 32 +-
src/mirall/mirallaccessmanager.h | 2 +
src/mirall/networkjobs.cpp | 4 +-
src/mirall/owncloudgui.cpp | 64 ++-
src/mirall/owncloudpropagator.cpp | 8 +
src/mirall/owncloudsetupwizard.cpp | 11 +
src/mirall/owncloudsetupwizard.h | 1 +
src/mirall/owncloudtheme.cpp | 35 +-
src/mirall/owncloudtheme.h | 1 -
src/mirall/progressdispatcher.cpp | 8 +-
src/mirall/progressdispatcher.h | 3 +
src/mirall/propagatorjobs.cpp | 37 +-
src/mirall/propagatorjobs.h | 1 +
src/mirall/protocolwidget.cpp | 10 +-
src/mirall/protocolwidget.h | 1 +
src/mirall/selectivesyncdialog.cpp | 282 ++++++++++++
src/mirall/selectivesyncdialog.h | 64 +++
src/mirall/settingsdialog.cpp | 28 +-
src/mirall/settingsdialog.h | 4 +-
src/mirall/socketapi.cpp | 57 ++-
src/mirall/socketapi.h | 12 +-
src/mirall/syncengine.cpp | 27 +-
src/mirall/syncengine.h | 41 +-
src/mirall/syncjournaldb.cpp | 23 +-
src/mirall/syncresult.cpp | 3 -
src/mirall/syncresult.h | 3 +-
src/mirall/theme.cpp | 47 +-
src/mirall/theme.h | 8 +-
src/mirall/utility.cpp | 1 +
src/mirall/utility_unix.cpp | 10 +-
src/wizard/owncloudwizard.cpp | 6 +
src/wizard/owncloudwizard.h | 1 +
test/testcsyncsqlite.h | 8 +
translations/mirall_ca.ts | 449 ++++++++++---------
translations/mirall_cs.ts | 449 ++++++++++---------
translations/mirall_de.ts | 449 ++++++++++---------
translations/mirall_el.ts | 450 ++++++++++---------
translations/mirall_en.ts | 447 +++++++++---------
translations/mirall_es.ts | 451 ++++++++++---------
translations/mirall_es_AR.ts | 447 +++++++++---------
translations/mirall_et.ts | 449 ++++++++++---------
translations/mirall_eu.ts | 456 ++++++++++---------
translations/mirall_fa.ts | 497 +++++++++++----------
translations/mirall_fi.ts | 447 +++++++++---------
translations/mirall_fr.ts | 457 ++++++++++---------
translations/mirall_gl.ts | 455 ++++++++++---------
translations/mirall_hu.ts | 447 +++++++++---------
translations/mirall_it.ts | 449 ++++++++++---------
translations/mirall_ja.ts | 451 ++++++++++---------
translations/mirall_nl.ts | 477 +++++++++++---------
translations/mirall_pl.ts | 451 ++++++++++---------
translations/mirall_pt.ts | 449 ++++++++++---------
translations/mirall_pt_BR.ts | 450 ++++++++++---------
translations/mirall_ru.ts | 449 ++++++++++---------
translations/mirall_sk.ts | 492 ++++++++++----------
translations/mirall_sl.ts | 449 ++++++++++---------
translations/mirall_sv.ts | 449 ++++++++++---------
translations/mirall_th.ts | 447 +++++++++---------
translations/mirall_tr.ts | 449 ++++++++++---------
translations/mirall_uk.ts | 447 +++++++++---------
translations/mirall_zh_CN.ts | 447 +++++++++---------
translations/mirall_zh_TW.ts | 447 +++++++++---------
102 files changed, 8445 insertions(+), 6633 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