[Pkg-owncloud-commits] [owncloud-client] 67/70: Merge tag 'upstream/1.6.0_rc2+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 8df37202ade88ba9e18e96fcba36fc00391d7cbb
Merge: 1664624 f08937a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 17 21:36:23 2014 +0200

    Merge tag 'upstream/1.6.0_rc2+dfsg'
    
    Upstream version 1.6.0~rc2+dfsg
    
    # gpg: Unterschrift vom Sa 17 Mai 2014 21:36:15 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                               |   2 +-
 ChangeLog                                          |   8 +-
 VERSION.cmake                                      |   2 +-
 csync/src/csync.c                                  |   4 +-
 csync/src/csync.h                                  |   1 +
 csync/src/csync_owncloud.c                         |   8 +-
 csync/src/csync_reconcile.c                        |   3 +-
 csync/src/csync_update.c                           |   8 +-
 csync/src/csync_util.c                             |   1 +
 csync/src/std/c_macro.h                            |   3 -
 csync/src/vio/csync_vio.c                          |   5 -
 csync/src/vio/csync_vio_local.c                    |   3 +
 .../tests/csync_tests/check_csync_statedb_query.c  |  17 --
 doc/CMakeLists.txt                                 |  13 +-
 doc/troubleshooting.rst                            |  22 ++
 src/CMakeLists.txt                                 |  13 +-
 src/creds/httpcredentials.cpp                      |   6 +-
 src/creds/shibboleth/shibbolethaccessmanager.cpp   |  55 ----
 src/creds/shibboleth/shibbolethaccessmanager.h     |  43 ---
 src/creds/shibboleth/shibbolethconfigfile.cpp      | 104 -------
 src/creds/shibboleth/shibbolethconfigfile.h        |  38 ---
 src/creds/shibboleth/shibbolethcookiejar.cpp       |  34 ---
 src/creds/shibboleth/shibbolethcookiejar.h         |  41 ---
 src/creds/shibboleth/shibbolethuserjob.cpp         |   2 +-
 src/creds/shibboleth/shibbolethwebview.cpp         |  86 ++----
 src/creds/shibboleth/shibbolethwebview.h           |  13 +-
 src/creds/shibbolethcredentials.cpp                | 168 +++++-----
 src/creds/shibbolethcredentials.h                  |  21 +-
 src/main.cpp                                       |  22 ++
 src/mirall/account.cpp                             |  17 +-
 src/mirall/account.h                               |   3 +
 src/mirall/accountsettings.cpp                     |   9 +-
 src/mirall/application.cpp                         |  13 +-
 src/mirall/cookiejar.cpp                           | 149 +++++++++
 src/mirall/cookiejar.h                             |  44 +++
 src/mirall/folder.cpp                              |  19 +-
 src/mirall/folder.h                                |   8 +-
 src/mirall/folderman.cpp                           |   6 +-
 src/mirall/folderwatcher.cpp                       |   4 +-
 src/mirall/mirallaccessmanager.cpp                 |   3 +
 src/mirall/networkjobs.h                           |   5 +-
 src/mirall/owncloudpropagator.cpp                  |  24 +-
 src/mirall/owncloudpropagator.h                    |   7 +-
 src/mirall/owncloudsetupwizard.cpp                 |  10 +-
 src/mirall/progressdispatcher.cpp                  |   4 +-
 src/mirall/progressdispatcher.h                    |  11 +-
 src/mirall/propagator_qnam.cpp                     |  49 ++-
 src/mirall/propagator_qnam.h                       |  11 +
 src/mirall/syncengine.cpp                          |   7 +
 src/mirall/syncfileitem.h                          |   3 +-
 src/mirall/syncjournalfilerecord.cpp               |  16 +-
 src/mirall/utility.cpp                             |   4 +-
 src/owncloudcmd/owncloudcmd.cpp                    |  13 +-
 .../owncloudlib.h => owncloudcmd/owncloudcmd.h}    |  23 +-
 src/wizard/owncloudshibbolethcredspage.cpp         |  64 +---
 src/wizard/owncloudshibbolethcredspage.h           |  11 +-
 sync-exclude.lst                                   |   1 +
 test/testfolderwatcher.h                           |   5 +-
 translations/mirall_ca.ts                          | 189 ++++++------
 translations/mirall_cs.ts                          | 163 +++++-----
 translations/mirall_de.ts                          | 163 +++++-----
 translations/mirall_el.ts                          | 175 ++++++-----
 translations/mirall_en.ts                          | 163 +++++-----
 translations/mirall_es.ts                          | 163 +++++-----
 translations/mirall_es_AR.ts                       | 163 +++++-----
 translations/mirall_et.ts                          | 163 +++++-----
 translations/mirall_eu.ts                          | 189 ++++++------
 translations/mirall_fa.ts                          | 163 +++++-----
 translations/mirall_fi.ts                          | 169 ++++++-----
 translations/mirall_fr.ts                          | 163 +++++-----
 translations/mirall_gl.ts                          | 163 +++++-----
 translations/mirall_hu.ts                          | 163 +++++-----
 translations/mirall_it.ts                          | 163 +++++-----
 translations/mirall_ja.ts                          | 201 ++++++------
 translations/mirall_nl.ts                          | 163 +++++-----
 translations/mirall_pl.ts                          | 163 +++++-----
 translations/mirall_pt.ts                          | 210 +++++++------
 translations/mirall_pt_BR.ts                       | 163 +++++-----
 translations/mirall_ru.ts                          | 175 ++++++-----
 translations/mirall_sk.ts                          | 163 +++++-----
 translations/mirall_sl.ts                          | 163 +++++-----
 translations/mirall_sv.ts                          | 163 +++++-----
 translations/mirall_th.ts                          | 163 +++++-----
 translations/mirall_tr.ts                          | 165 +++++-----
 translations/mirall_uk.ts                          | 163 +++++-----
 translations/mirall_zh_CN.ts                       | 337 +++++++++++----------
 translations/mirall_zh_TW.ts                       | 163 +++++-----
 87 files changed, 3339 insertions(+), 3020 deletions(-)

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