[Pkg-owncloud-commits] [owncloud-client] 85/498: Merge remote-tracking branch 'origin/master' into new-ui
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:38 UTC 2015
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 716b0c68dad29cb975c8e5ab0ccc0f0aa9109fa5
Merge: 1edd46b 00a075b
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Tue May 12 15:20:40 2015 +0200
Merge remote-tracking branch 'origin/master' into new-ui
ChangeLog | 6 +-
VERSION.cmake | 4 +-
binary | 2 +-
binary.rej | 5 +
csync/src/csync_exclude.c | 1 +
csync/src/csync_log.h | 2 +-
csync/src/httpbf/src/httpbf.c | 2 +-
csync/tests/csync_tests/check_csync_log.c | 2 +-
doc/conffile.rst | 2 +-
.../MacOSX/OwnCloudFinder/ContentManager.h | 4 +-
.../MacOSX/OwnCloudFinder/ContentManager.m | 85 ++-----
.../MacOSX/OwnCloudFinder/RequestManager.h | 3 +-
.../MacOSX/OwnCloudFinder/RequestManager.m | 22 +-
shell_integration/MacOSX/deploy.sh | 7 +-
.../windows/OCUtil/RemotePathChecker.cpp | 44 ++--
.../windows/OCUtil/RemotePathChecker.h | 1 +
src/gui/accountsettings.cpp | 2 +-
src/gui/accountstate.cpp | 12 +-
src/gui/accountstate.h | 8 +-
src/gui/application.cpp | 35 +--
src/gui/application.h | 5 -
src/gui/folder.cpp | 14 +-
src/gui/folder.h | 5 +
src/gui/folderman.cpp | 2 +-
src/gui/ignorelisteditor.cpp | 1 -
src/gui/owncloudgui.cpp | 2 +-
src/gui/owncloudsetupwizard.cpp | 4 +
src/gui/protocolwidget.cpp | 2 +-
src/gui/sharedialog.cpp | 107 ++++----
src/gui/sharedialog.h | 15 +-
src/gui/socketapi.cpp | 2 +-
src/gui/updater/sparkleupdater_mac.mm | 22 +-
src/gui/wizard/owncloudsetuppage.cpp | 3 +-
src/libsync/account.cpp | 38 ++-
src/libsync/account.h | 7 +-
src/libsync/bandwidthmanager.cpp | 58 ++---
src/libsync/clientproxy.cpp | 1 +
src/libsync/connectionvalidator.cpp | 13 +-
src/libsync/connectionvalidator.h | 2 +-
src/libsync/creds/httpcredentials.cpp | 41 ++-
src/libsync/filesystem.cpp | 46 +++-
src/libsync/filesystem.h | 37 ++-
src/libsync/networkjobs.cpp | 19 +-
src/libsync/networkjobs.h | 2 +-
src/libsync/propagatedownload.cpp | 64 ++++-
src/libsync/propagateupload.cpp | 46 +++-
src/libsync/propagateupload.h | 15 ++
src/libsync/propagator_legacy.cpp | 6 +-
src/libsync/syncengine.cpp | 9 +-
src/libsync/syncjournaldb.cpp | 21 +-
src/libsync/syncjournaldb.h | 2 +
src/libsync/utility_win.cpp | 42 +++-
src/mirall/qbacktrace.h | 24 ++
test/mockserver/CMakeLists.txt | 21 ++
test/mockserver/httpserver.cpp | 63 +++++
test/mockserver/httpserver.h | 26 ++
test/mockserver/main.cpp | 23 ++
test/testowncloudpropagator.h | 44 ++++
test/testxmlparse.h | 210 +++++++++++++++-
translations/client_ca.ts | 237 ++++++++++--------
translations/client_cs.ts | 200 ++++++++-------
translations/client_de.ts | 262 ++++++++++---------
translations/client_el.ts | 206 ++++++++-------
translations/client_en.ts | 200 ++++++++-------
translations/client_es.ts | 220 ++++++++--------
translations/client_es_AR.ts | 200 ++++++++-------
translations/client_et.ts | 200 ++++++++-------
translations/client_eu.ts | 200 ++++++++-------
translations/client_fa.ts | 200 ++++++++-------
translations/client_fi.ts | 242 +++++++++---------
translations/client_fr.ts | 200 ++++++++-------
translations/client_gl.ts | 200 ++++++++-------
translations/client_hu.ts | 200 ++++++++-------
translations/client_it.ts | 200 ++++++++-------
translations/client_ja.ts | 228 +++++++++--------
translations/client_nl.ts | 200 ++++++++-------
translations/client_pl.ts | 200 ++++++++-------
translations/client_pt.ts | 200 ++++++++-------
translations/client_pt_BR.ts | 200 ++++++++-------
translations/client_ru.ts | 202 ++++++++-------
translations/client_sk.ts | 200 ++++++++-------
translations/client_sl.ts | 200 ++++++++-------
translations/client_sr.ts | 206 ++++++++-------
translations/client_sv.ts | 200 ++++++++-------
translations/client_th.ts | 200 ++++++++-------
translations/client_tr.ts | 278 +++++++++++----------
translations/client_uk.ts | 200 ++++++++-------
translations/client_zh_CN.ts | 200 ++++++++-------
translations/client_zh_TW.ts | 200 ++++++++-------
89 files changed, 4401 insertions(+), 3193 deletions(-)
diff --cc src/gui/folder.cpp
index 73273c6,fa50a28..a13118a
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@@ -175,9 -179,9 +175,9 @@@ QString Folder::alias() cons
QString Folder::path() const
{
- QString p(_path);
+ QString p(_definition.localPath);
- if( ! p.endsWith(QLatin1Char('/')) ) {
- p.append(QLatin1Char('/'));
+ if( ! p.endsWith(QDir::separator()) ) {
+ p.append(QDir::separator());
}
return p;
}
diff --cc src/gui/sharedialog.cpp
index 43440c5,3d50554..581c9ef
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@@ -282,10 -284,8 +285,8 @@@ void ShareDialog::slotSharesFetched(con
displayError(code);
}
- bool success = false;
- QVariantMap json = QtJson::parse(reply, success).toMap();
- ShareDialog::_shares = json.value("ocs").toMap().value("data").toList();
+ ShareDialog::_shares = reply.value("ocs").toMap().value("data").toList();
- const QString versionString = AccountManager::instance()->account()->serverVersion();
+ const QString versionString = _account->serverVersion();
Q_FOREACH(auto share, ShareDialog::_shares) {
QVariantMap data = share.toMap();
diff --cc src/libsync/creds/httpcredentials.cpp
index 306e4c0,6fada53..bf88b69
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@@ -186,17 -171,9 +171,17 @@@ QString HttpCredentials::certificatePas
return _certificatePasswd;
}
+void HttpCredentials::setAccount(Account* account)
+{
+ AbstractCredentials::setAccount(account);
+ if (_user.isEmpty()) {
+ fetchUser();
+ }
+}
+
QNetworkAccessManager* HttpCredentials::getQNAM() const
{
- AccessManager* qnam = new HttpCredentialsAccessManager(this);
+ AccessManager* qnam = new AccessManager;
connect( qnam, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
this, SLOT(slotAuthentication(QNetworkReply*,QAuthenticator*)));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list