[Pkg-owncloud-commits] [owncloud-client] 01/12: Merge branch 'master' into experimental
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Feb 17 09:42:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch experimental
in repository owncloud-client.
commit 337162125dcf6d71a2f98b30d379c84594d4fb31
Merge: 5c56eb1 d7bf8e9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Mon Feb 8 01:02:52 2016 +0100
Merge branch 'master' into experimental
.gitmodules | 3 +
.tag | 2 +-
ChangeLog | 20 +
VERSION.cmake | 4 +-
cmake/modules/NSIS.template.in | 5 -
csync/src/csync.h | 5 +-
csync/src/csync_private.h | 2 +-
csync/src/csync_reconcile.c | 8 +-
csync/src/csync_update.c | 10 +
csync/src/csync_util.c | 1 +
csync/src/vio/csync_vio_local_win.c | 11 +
csync/tests/csync_tests/check_csync_exclude.c | 20 +
debian/changelog | 6 +
debian/patches/0001-disable-updatecheck.patch | 10 +-
debian/patches/0006-move-configfile.patch | 10 +-
doc/autoupdate.rst | 3 +-
doc/images/mac-share.png | Bin 0 -> 59496 bytes
doc/images/share-1.png | Bin 0 -> 18267 bytes
doc/images/share-2.png | Bin 0 -> 24573 bytes
doc/introduction.rst | 36 +-
doc/navigating.rst | 73 +-
doc/owncloudcmd.1.rst | 12 +
doc/owncloudcmd.rst | 31 +-
.../dolphin/ownclouddolphinoverlayplugin.cpp | 8 +-
.../icons/nopadding/SVG/attention.svg | 72 +-
shell_integration/icons/nopadding/SVG/error.svg | 75 ++-
.../icons/nopadding/SVG/generate_windows_ico.sh | 8 +
shell_integration/icons/nopadding/SVG/ok.svg | 59 +-
shell_integration/icons/nopadding/SVG/shared.svg | 109 ++-
shell_integration/icons/nopadding/SVG/sync.svg | 103 ++-
shell_integration/nautilus/CMakeLists.txt | 14 +-
src/gui/accountsettings.cpp | 19 +-
src/gui/accountstate.cpp | 31 +-
src/gui/accountstate.h | 12 +-
src/gui/activityitemdelegate.cpp | 19 +-
src/gui/activitywidget.cpp | 30 +-
src/gui/application.cpp | 52 +-
src/gui/creds/shibbolethcredentials.cpp | 12 +-
src/gui/creds/shibbolethcredentials.h | 1 +
src/gui/folder.cpp | 72 +-
src/gui/folder.h | 8 +-
src/gui/folderman.cpp | 20 +-
src/gui/folderman.h | 2 +-
src/gui/folderstatusdelegate.cpp | 129 ++--
src/gui/folderstatusdelegate.h | 5 +-
src/gui/folderstatusmodel.cpp | 8 +-
src/gui/folderwatcher_linux.cpp | 3 +-
src/gui/main.cpp | 23 +
src/gui/owncloudgui.cpp | 46 +-
src/gui/owncloudgui.h | 3 +
src/gui/protocolwidget.cpp | 48 +-
src/gui/protocolwidget.h | 2 +-
src/gui/protocolwidget.ui | 2 +-
src/gui/settingsdialog.cpp | 31 +-
src/gui/settingsdialog.h | 1 -
src/gui/settingsdialogmac.cpp | 2 +-
src/gui/share.cpp | 14 +-
src/gui/share.h | 16 +-
src/gui/sharee.cpp | 39 +-
src/gui/sharee.h | 3 +
src/gui/sharelinkwidget.cpp | 80 ++-
src/gui/sharelinkwidget.h | 6 +-
src/gui/sharelinkwidget.ui | 61 +-
src/gui/shareusergroupwidget.cpp | 70 +-
src/gui/shareusergroupwidget.h | 5 +-
src/gui/shareusergroupwidget.ui | 12 +-
src/gui/socketapi.cpp | 30 +-
src/gui/syncrunfilelog.cpp | 3 +
src/gui/systray.mm | 19 +
src/gui/wizard/owncloudhttpcredspage.cpp | 7 +
src/libsync/abstractnetworkjob.cpp | 5 +-
src/libsync/account.cpp | 1 -
src/libsync/capabilities.cpp | 1 +
src/libsync/checksums.cpp | 54 ++
src/libsync/configfile.cpp | 15 +-
src/libsync/configfile.h | 1 +
src/libsync/creds/abstractcredentials.h | 17 +-
src/libsync/creds/dummycredentials.h | 1 +
src/libsync/creds/httpcredentials.cpp | 55 +-
src/libsync/creds/httpcredentials.h | 2 +
src/libsync/creds/tokencredentials.cpp | 7 +-
src/libsync/creds/tokencredentials.h | 3 +-
src/libsync/filesystem.cpp | 52 +-
src/libsync/filesystem.h | 13 +
src/libsync/owncloudpropagator.cpp | 84 ++-
src/libsync/owncloudpropagator.h | 17 +-
src/libsync/progressdispatcher.cpp | 2 +
src/libsync/progressdispatcher.h | 3 +-
src/libsync/propagatedownload.cpp | 66 +-
src/libsync/propagatedownload.h | 16 +-
src/libsync/propagateremotemkdir.cpp | 27 +-
src/libsync/propagateremotemkdir.h | 13 +-
src/libsync/propagateupload.cpp | 56 +-
src/libsync/propagateupload.h | 18 +-
src/libsync/propagatorjobs.cpp | 36 +-
src/libsync/propagatorjobs.h | 14 +-
src/libsync/syncengine.cpp | 50 +-
src/libsync/syncfileitem.h | 7 +
src/libsync/syncfilestatus.cpp | 2 +-
src/libsync/syncfilestatus.h | 2 +-
src/libsync/syncjournaldb.cpp | 3 +-
translations/client_ca.ts | 474 ++++++-------
translations/client_cs.ts | 478 ++++++-------
translations/client_de.ts | 524 ++++++++-------
translations/client_el.ts | 472 ++++++-------
translations/client_en.ts | 468 ++++++-------
translations/client_es.ts | 588 ++++++++--------
translations/client_es_AR.ts | 470 ++++++-------
translations/client_et.ts | 548 +++++++--------
translations/client_eu.ts | 742 +++++++++++----------
translations/client_fa.ts | 470 ++++++-------
translations/client_fi.ts | 472 ++++++-------
translations/client_fr.ts | 492 +++++++-------
translations/client_gl.ts | 470 ++++++-------
translations/client_hu.ts | 478 ++++++-------
translations/client_it.ts | 482 ++++++-------
translations/client_ja.ts | 486 +++++++-------
translations/client_nb_NO.ts | 578 ++++++++--------
translations/client_nl.ts | 486 +++++++-------
translations/client_pl.ts | 470 ++++++-------
translations/client_pt.ts | 566 ++++++++--------
translations/client_pt_BR.ts | 496 +++++++-------
translations/client_ru.ts | 520 ++++++++-------
translations/client_sk.ts | 470 ++++++-------
translations/client_sl.ts | 640 +++++++++---------
translations/client_sr.ts | 608 ++++++++---------
translations/client_sv.ts | 478 ++++++-------
translations/client_th.ts | 478 ++++++-------
translations/client_tr.ts | 536 +++++++--------
translations/client_uk.ts | 548 +++++++--------
translations/client_zh_CN.ts | 472 ++++++-------
translations/client_zh_TW.ts | 600 +++++++++--------
132 files changed, 9743 insertions(+), 8626 deletions(-)
diff --cc debian/changelog
index 1fc3fa4,bb6d481..dc5474e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ owncloud-client (2.1.1~rc1+dfsg-0) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Sandro Knauß <bugs at sandroknauss.de> Fri, 05 Feb 2016 14:36:03 +0100
+
+owncloud-client (2.1.0+dfsg-2) experimental; urgency=medium
+
+ * Add dolphin plugin.
+
+ -- Sandro Knauß <bugs at sandroknauss.de> Sun, 24 Jan 2016 02:32:02 +0100
+
owncloud-client (2.1.0+dfsg-1) unstable; urgency=medium
* New upstream release.
--
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