[Pkg-owncloud-commits] [owncloud-client] 01/01: Merge tag 'upstream/1.5.2+dfsg'

[Sandro Knauß]

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 a113a4215e41935b385c775a5389419bf4f6ee27
Merge: b9f7b10 1ab5ea1
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Feb 27 20:47:39 2014 +0100

    Merge tag 'upstream/1.5.2+dfsg'
    
    Upstream version 1.5.2+dfsg

 .tag                                               |  2 +-
 ChangeLog                                          | 22 ++++++
 VERSION.cmake                                      |  2 +-
 csync/src/csync_update.c                           |  9 +--
 csync/src/httpbf/tests/hbf_send_test.c             | 20 ++++++
 csync/src/std/c_string.c                           |  2 +-
 csync/tests/cmdline.c                              | 19 +++++
 csync/tests/csync_tests/check_csync_commit.c       | 19 +++++
 csync/tests/csync_tests/check_csync_create.c       | 19 +++++
 csync/tests/csync_tests/check_csync_exclude.c      | 19 +++++
 csync/tests/csync_tests/check_csync_init.c         | 19 +++++
 csync/tests/csync_tests/check_csync_log.c          | 19 +++++
 csync/tests/csync_tests/check_csync_misc.c         | 19 +++++
 csync/tests/csync_tests/check_csync_statedb_load.c | 19 +++++
 .../tests/csync_tests/check_csync_statedb_query.c  | 19 +++++
 csync/tests/csync_tests/check_csync_time.c         | 19 +++++
 csync/tests/csync_tests/check_csync_treewalk.c     | 19 +++++
 csync/tests/csync_tests/check_csync_update.c       | 19 +++++
 csync/tests/csync_tests/check_csync_util.c         | 19 +++++
 csync/tests/encoding_tests/check_encoding.c        | 19 +++++
 csync/tests/httpbf_tests/hbf_send_test.c           | 19 +++++
 csync/tests/log_tests/check_log.c                  | 19 +++++
 csync/tests/ownCloud/t1.pl                         | 14 ++++
 csync/tests/ownCloud/t2.pl                         | 14 ++++
 csync/tests/ownCloud/t3.pl                         | 14 ++++
 csync/tests/ownCloud/t4.pl                         | 14 ++++
 csync/tests/std_tests/check_std_c_alloc.c          | 19 +++++
 csync/tests/std_tests/check_std_c_dir.c            | 19 +++++
 csync/tests/std_tests/check_std_c_file.c           | 19 +++++
 csync/tests/std_tests/check_std_c_list.c           | 19 +++++
 csync/tests/std_tests/check_std_c_path.c           | 19 +++++
 csync/tests/std_tests/check_std_c_rbtree.c         | 19 +++++
 csync/tests/std_tests/check_std_c_str.c            | 19 +++++
 csync/tests/std_tests/check_std_c_time.c           | 19 +++++
 csync/tests/torture.c                              | 19 +++++
 csync/tests/torture.h                              | 19 +++++
 csync/tests/vio_tests/check_vio.c                  | 19 +++++
 csync/tests/vio_tests/check_vio_file_stat.c        | 19 +++++
 csync/tests/vio_tests/check_vio_handle.c           | 19 +++++
 doc/scripts/htmlhelp.sh                            | 13 ++++
 src/CMakeLists.txt                                 |  2 +
 src/creds/abstractcredentials.h                    |  4 ++
 src/creds/httpcredentials.cpp                      | 80 ++++++++++++++--------
 src/creds/httpcredentials.h                        |  1 +
 src/creds/shibboleth/shibbolethaccessmanager.cpp   |  3 +-
 src/creds/shibbolethcredentials.cpp                | 68 +++++++++++++++---
 src/creds/shibbolethcredentials.h                  |  5 ++
 src/mirall/account.cpp                             | 14 +++-
 src/mirall/account.h                               |  4 ++
 src/mirall/accountsettings.cpp                     |  9 ++-
 src/mirall/application.cpp                         | 30 +++++++-
 src/mirall/application.h                           |  3 +-
 src/mirall/folder.cpp                              |  5 +-
 src/mirall/folderwatcher_mac.cpp                   |  2 +-
 src/mirall/mirallconfigfile.cpp                    |  1 -
 src/mirall/networkjobs.cpp                         | 10 +--
 src/mirall/owncloudgui.cpp                         |  8 ---
 src/mirall/owncloudgui.h                           |  4 --
 src/mirall/owncloudpropagator.cpp                  | 72 +++++++++++++------
 src/mirall/owncloudpropagator.h                    | 10 ++-
 src/mirall/quotainfo.cpp                           | 49 +++++++------
 src/mirall/quotainfo.h                             |  9 ++-
 src/mirall/settingsdialog.cpp                      | 15 ++--
 src/mirall/settingsdialog.h                        |  2 +-
 src/mirall/sslbutton.cpp                           | 25 ++++---
 src/mirall/syncjournaldb.cpp                       |  3 +-
 src/mirall/theme.cpp                               |  2 +-
 src/wizard/abstractcredswizardpage.cpp             | 34 +++++++++
 src/wizard/abstractcredswizardpage.h               |  3 +-
 src/wizard/owncloudshibbolethcredspage.cpp         |  4 +-
 test/manual/favlink/main.cpp                       | 12 ++++
 test/scripts/torture_create_files.pl               | 13 ++++
 test/scripts/torture_gen_layout.pl                 | 13 ++++
 translations/mirall_de.ts                          |  6 +-
 74 files changed, 1056 insertions(+), 146 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git