[Pkg-owncloud-commits] [owncloud-client] 138/498: Merge branch 'master' into new-ui

[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 139b28b471afdc5527bfd88d06d3efd260ddccb0
Merge: 12f7605 16786ee
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 10 15:57:55 2015 +0200

    Merge branch 'master' into new-ui
    
     Conflicts:
    	src/gui/folder.cpp
            src/gui/folder.h
    	src/gui/folderman.cpp

 CONTRIBUTING.md                             |   1 +
 ChangeLog                                   |  35 +++---
 admin/win/nsi/l10n/Thai.nsh                 |  46 ++++++++
 admin/win/nsi/l10n/languages.nsh            |   1 +
 csync/src/csync_exclude.c                   |   2 +
 csync/src/csync_private.h                   |   8 +-
 csync/src/csync_update.c                    |  23 +++-
 doc/troubleshooting.rst                     |  20 ++--
 src/cmd/cmd.cpp                             |  34 +-----
 src/gui/accountstate.cpp                    |   5 +-
 src/gui/folder.cpp                          |  12 ---
 src/gui/folder.h                            |   3 -
 src/gui/folderman.cpp                       |   7 +-
 src/gui/owncloudsetupwizard.cpp             |   3 +-
 src/gui/selectivesyncdialog.cpp             |   7 +-
 src/gui/sharedialog.cpp                     |   2 +-
 src/gui/socketapi.cpp                       |  15 ++-
 src/gui/socketapi.h                         |   4 +-
 src/libsync/account.cpp                     |   6 +-
 src/libsync/connectionvalidator.cpp         |   2 +-
 src/libsync/discoveryphase.cpp              | 162 +++++++++++++++++++++++-----
 src/libsync/discoveryphase.h                |  21 +++-
 src/libsync/filesystem.h                    |   6 +-
 src/libsync/networkjobs.cpp                 |  26 ++++-
 src/libsync/networkjobs.h                   |  11 ++
 src/libsync/ownsql.cpp                      |   7 +-
 src/libsync/ownsql.h                        |   1 -
 src/libsync/propagateupload.cpp             |   7 +-
 src/libsync/propagatorjobs.cpp              |   1 +
 src/libsync/syncengine.cpp                  |  24 +++--
 src/libsync/syncengine.h                    |  14 ++-
 src/libsync/syncjournaldb.cpp               |  63 +++++++++++
 src/libsync/syncjournaldb.h                 |  19 ++++
 src/libsync/syncjournalfilerecord.cpp       |   2 +-
 src/libsync/transmissionchecksumvalidator.h |   4 +-
 translations/client_ca.ts                   |  60 +++++------
 translations/client_cs.ts                   |  64 +++++------
 translations/client_de.ts                   |  58 +++++-----
 translations/client_el.ts                   |  58 +++++-----
 translations/client_en.ts                   |  58 +++++-----
 translations/client_es.ts                   |  58 +++++-----
 translations/client_es_AR.ts                |  58 +++++-----
 translations/client_et.ts                   |  58 +++++-----
 translations/client_eu.ts                   |  58 +++++-----
 translations/client_fa.ts                   |  58 +++++-----
 translations/client_fi.ts                   |  58 +++++-----
 translations/client_fr.ts                   |  64 +++++------
 translations/client_gl.ts                   |  60 +++++------
 translations/client_hu.ts                   |  58 +++++-----
 translations/client_it.ts                   |  58 +++++-----
 translations/client_ja.ts                   |  58 +++++-----
 translations/client_nb_NO.ts                |  62 +++++------
 translations/client_nl.ts                   |  58 +++++-----
 translations/client_pl.ts                   |  58 +++++-----
 translations/client_pt.ts                   |  58 +++++-----
 translations/client_pt_BR.ts                |  58 +++++-----
 translations/client_ru.ts                   |  72 ++++++-------
 translations/client_sk.ts                   |  58 +++++-----
 translations/client_sl.ts                   |  58 +++++-----
 translations/client_sr.ts                   |  64 +++++------
 translations/client_sv.ts                   |  58 +++++-----
 translations/client_th.ts                   |  92 ++++++++--------
 translations/client_tr.ts                   | 122 ++++++++++-----------
 translations/client_uk.ts                   | 116 ++++++++++----------
 translations/client_zh_CN.ts                |  58 +++++-----
 translations/client_zh_TW.ts                |  58 +++++-----
 66 files changed, 1447 insertions(+), 1151 deletions(-)

diff --cc src/gui/folderman.cpp
index c39f1f5,ee2beb0..8ecc1d8
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@@ -401,7 -373,15 +400,13 @@@ Folder* FolderMan::setupFolderFromOldCo
      connect(folder, SIGNAL(syncStarted()), SLOT(slotFolderSyncStarted()));
      connect(folder, SIGNAL(syncFinished(SyncResult)), SLOT(slotFolderSyncFinished(SyncResult)));
  
 -    _folderChangeSignalMapper->setMapping( folder, folder->alias() );
 -
      registerFolderMonitor(folder);
+     QStringList blackList = settings.value( QLatin1String("blackList")).toStringList();
+     if (!blackList.empty()) {
+         //migrate settings
+         folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, blackList);
+         settings.remove(QLatin1String("blackList"));
+     }
      return folder;
  }
  

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