[Pkg-owncloud-commits] [owncloud-client] 68/70: Imported Upstream version 1.6.1+dfsg
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Jul 1 10:21:24 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 1e786189f769d5dce3fd309553cb35c6d6d11e7e
Merge: 2f68a12 40d765c
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Jul 1 12:16:17 2014 +0200
Imported Upstream version 1.6.1+dfsg
.tag | 2 +-
ChangeLog | 21 ++
VERSION.cmake | 4 +-
cmake/modules/NSIS.template.in | 10 +-
csync/config_csync.h.cmake | 2 +-
csync/src/csync.c | 5 -
csync/src/csync_exclude.c | 4 +
csync/src/csync_owncloud.c | 2 +-
csync/src/csync_owncloud_recursive_propfind.c | 7 +-
csync/src/csync_reconcile.c | 12 +-
csync/src/csync_statedb.c | 14 +-
csync/src/csync_update.c | 3 +
csync/src/csync_util.c | 12 +-
csync/src/httpbf/src/httpbf.c | 4 +-
csync/src/std/c_time.c | 3 +-
csync/src/vio/csync_vio_local.c | 1 +
doc/accountsetup.rst | 41 ++-
doc/architecture.rst | 263 ++++++++---------
doc/autoupdate.rst | 139 +++++----
doc/building.rst | 160 ++++++-----
doc/conffile.rst | 24 +-
doc/faq.rst | 17 +-
doc/images/client_setup_wizard_components.png | Bin 0 -> 35196 bytes
doc/images/client_setup_wizard_install_finish.png | Bin 0 -> 21141 bytes
.../client_setup_wizard_install_progress.png | Bin 0 -> 19726 bytes
doc/images/client_setup_wizard_location.png | Bin 0 -> 30498 bytes
doc/images/client_setup_wizard_main.png | Bin 0 -> 25868 bytes
doc/images/client_setup_wizard_reinstall.png | Bin 0 -> 33624 bytes
doc/images/client_setup_wizard_uninstall.png | Bin 0 -> 33621 bytes
doc/images/client_setup_wizard_uninstall_2.png | Bin 0 -> 29159 bytes
doc/images/client_setup_wizard_uninstall_3.png | Bin 0 -> 31134 bytes
doc/images/download_button.png | Bin 0 -> 1163 bytes
doc/images/log_output_window.png | Bin 0 -> 43946 bytes
doc/images/oc_client_download_options.png | Bin 0 -> 7171 bytes
doc/images/oc_client_linux_download.png | Bin 0 -> 35366 bytes
doc/images/oc_client_macosx_download.png | Bin 0 -> 33779 bytes
doc/images/oc_client_windows_download.png | Bin 0 -> 24779 bytes
doc/images/oc_client_windows_option.png | Bin 0 -> 1689 bytes
doc/images/oc_connection_wizard_credentials.png | Bin 0 -> 33007 bytes
doc/images/oc_connection_wizard_finish.png | Bin 0 -> 40657 bytes
doc/images/oc_connection_wizard_localfolder.png | Bin 0 -> 37287 bytes
doc/images/oc_connection_wizard_server.png | Bin 0 -> 32433 bytes
doc/images/oc_website.png | Bin 0 -> 72353 bytes
doc/images/owncloud_logo_transparent.png | Bin 0 -> 47374 bytes
doc/images/owncloud_small_wh_bl.jpg | Bin 0 -> 11741 bytes
doc/images/save_log_file.png | Bin 0 -> 68034 bytes
doc/images/security_warning_windows.png | Bin 0 -> 13093 bytes
doc/index.rst | 5 +-
doc/installing-linux.rst | 208 ++++++++++++++
doc/installing-macosx.rst | 4 +
doc/installing-windows.rst | 102 +++++++
doc/installing.rst | 13 +
doc/introduction.rst | 34 +--
doc/logo-blue.pdf | Bin 1851 -> 1849 bytes
doc/navigating.rst | 313 +++++++++++++++++++++
doc/options.rst | 15 +-
doc/owncloud.1.rst | 8 +-
doc/owncloudcmd.1.rst | 28 +-
doc/owncloudcmd.rst | 57 ++--
doc/troubleshooting.rst | 269 +++++++++++-------
src/3rdparty/fancylineedit/fancylineedit.cpp | 2 +-
src/creds/shibboleth/shibbolethuserjob.h | 4 +-
src/creds/shibboleth/shibbolethwebview.cpp | 20 --
src/creds/shibboleth/shibbolethwebview.h | 3 +-
src/creds/shibbolethcredentials.cpp | 47 +++-
src/creds/shibbolethcredentials.h | 6 +
src/mirall/accountsettings.cpp | 30 +-
src/mirall/accountsettings.h | 1 -
src/mirall/folder.cpp | 15 +-
src/mirall/folder.h | 1 -
src/mirall/folderstatusmodel.h | 3 -
src/mirall/folderwizard.cpp | 16 +-
src/mirall/folderwizard.h | 5 +-
src/mirall/owncloudgui.cpp | 5 +-
src/mirall/owncloudpropagator.cpp | 35 ++-
src/mirall/owncloudtheme.cpp | 3 +-
src/mirall/propagator_legacy.cpp | 5 +
src/mirall/propagator_legacy.h | 3 +-
src/mirall/propagator_qnam.cpp | 41 ++-
src/mirall/settingsdialogmac.cpp | 12 +
src/mirall/syncengine.cpp | 22 +-
src/mirall/syncengine.h | 3 +-
src/mirall/syncfileitem.h | 5 +-
src/mirall/syncjournaldb.cpp | 24 +-
src/mirall/syncjournaldb.h | 10 +-
src/mirall/theme.cpp | 10 +-
src/mirall/theme.h | 2 +-
src/owncloudcmd/owncloudcmd.cpp | 1 -
src/wizard/owncloudsetuppage.cpp | 2 +
src/wizard/owncloudsetuppage.h | 1 -
src/wizard/owncloudshibbolethcredspage.cpp | 13 +-
src/wizard/owncloudshibbolethcredspage.h | 3 +-
src/wizard/owncloudwizard.cpp | 1 +
93 files changed, 1532 insertions(+), 628 deletions(-)
diff --cc .tag
index b8de0c8,6828f88..4d9bbbe
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 746c15b4aa5f1b80ee1aec3b5cee1c29eb311e5c
-$Format:%H$
++40d765c73aa64de2fcf8503886f27c8da7b7d3d9
--
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