[Pkg-owncloud-commits] [owncloud-client] 29/30: Merge tag 'upstream/1.5.3+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 b3e39752a74b38cef0db7705b616724e0bf83288
Merge: 06907f9 3417870
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Mar 15 22:23:51 2014 +0100

    Merge tag 'upstream/1.5.3+dfsg'
    
    Upstream version 1.5.3+dfsg
    
    # gpg: Unterschrift vom Sa 15 Mär 2014 22:23:45 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                          |   2 +-
 CMakeLists.txt                                |   3 +
 ChangeLog                                     |  18 +-
 VERSION.cmake                                 |   2 +-
 csync/ConfigureChecks.cmake                   |   5 -
 csync/src/csync_owncloud.c                    |   5 -
 src/CMakeLists.txt                            |   6 +-
 src/creds/httpcredentials.cpp                 |  49 ++++-
 src/creds/shibboleth/authenticationdialog.cpp |  56 ++++++
 src/creds/shibboleth/authenticationdialog.h   |  41 ++++
 src/creds/shibboleth/shibbolethwebview.cpp    |  26 ++-
 src/creds/shibboleth/shibbolethwebview.h      |   1 +
 src/mirall/account.cpp                        |   5 +
 src/mirall/account.h                          |   2 +
 src/mirall/application.cpp                    |  34 +---
 src/mirall/application.h                      |   1 -
 src/mirall/connectionvalidator.cpp            |  13 +-
 src/mirall/folderman.cpp                      |   9 +-
 src/mirall/mirallaccessmanager.cpp            |  14 ++
 src/mirall/mirallaccessmanager.h              |   2 +
 src/mirall/networkjobs.cpp                    |  10 +-
 src/mirall/networksettings.ui                 | 278 ++++++++++++++------------
 src/wizard/owncloudshibbolethcredspage.cpp    |   1 +
 23 files changed, 391 insertions(+), 192 deletions(-)

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