[Pkg-owncloud-commits] [owncloud-client] 200/332: Merge branch '1.6' into il

[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 8961e61f60ddc5d0a41e9c92b0f355924f89d7fd
Merge: 3477ea0 d697969
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jul 16 09:57:40 2014 +0200

    Merge branch '1.6' into il
    
    Conflicts:
    	VERSION.cmake
    	src/mirall/syncengine.cpp
    	src/mirall/syncengine.h

 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/creds/httpcredentials.cpp                      |  48 +++-
 src/creds/httpcredentials.h                        |   1 +
 src/creds/shibboleth/shibbolethuserjob.h           |   4 +-
 src/creds/shibboleth/shibbolethwebview.cpp         |  14 +-
 src/creds/shibboleth/shibbolethwebview.h           |   1 +
 src/creds/shibbolethcredentials.cpp                |  17 ++
 src/creds/shibbolethcredentials.h                  |   3 +
 src/mirall/folder.cpp                              |   5 +-
 src/mirall/propagator_qnam.cpp                     |  27 +-
 src/mirall/propagator_qnam.h                       |   2 +-
 src/mirall/protocolwidget.cpp                      |   7 +
 src/mirall/syncengine.cpp                          |  26 +-
 src/mirall/syncengine.h                            |   3 +-
 src/wizard/owncloudshibbolethcredspage.cpp         |  10 +-
 src/wizard/owncloudshibbolethcredspage.h           |   3 +-
 59 files changed, 1351 insertions(+), 520 deletions(-)

diff --cc src/mirall/syncengine.cpp
index 0d0929b,c5c45fb..3370811
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@@ -60,9 -61,11 +60,10 @@@ SyncEngine::SyncEngine(CSYNC *ctx, cons
    , _remoteUrl(remoteURL)
    , _remotePath(remotePath)
    , _journal(journal)
-   , _hasFiles(false)
+   , _hasNoneFiles(false)
+   , _hasRemoveFile(false)
 -  , _downloadLimit(0)
    , _uploadLimit(0)
 -
 +  , _downloadLimit(0)
  {
      qRegisterMetaType<SyncFileItem>("SyncFileItem");
      qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
diff --cc src/mirall/syncengine.h
index f782917,e52ecb8..34d919a
--- a/src/mirall/syncengine.h
+++ b/src/mirall/syncengine.h
@@@ -127,20 -127,11 +127,21 @@@ private
      QHash<QString, QString> _renamedFolders;
      QString adjustRenamedPath(const QString &original);
  
 +    /**
 +     * check if we are allowed to propagate everything, and if we are not, adjust the instructions
 +     * to recover
 +     */
 +    void checkForPermission();
 +    QByteArray getPermissions(const QString& file) const;
 +
-     bool _hasFiles; // true if there is at least one file that is not ignored or removed
+     bool _hasNoneFiles; // true if there is at least one file with instruction NONE
+     bool _hasRemoveFile; // true if there is at leasr one file with instruction REMOVE
  
 -    int _downloadLimit;
      int _uploadLimit;
 +    int _downloadLimit;
 +
 +    // hash containing the permissions on the remote directory
 +    QHash<QString, QByteArray> _remotePerms;
  };
  
  

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