mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 23:17:13 +03:00
Merge remote-tracking branch 'origin/2.3'
Conflicts: src/libsync/owncloudpropagator.h
This commit is contained in:
commit
4597201560
3 changed files with 10 additions and 3 deletions
|
@ -1,6 +1,13 @@
|
||||||
ChangeLog
|
ChangeLog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
version 2.3.1 (2017-03-2x)
|
||||||
|
* Fix several crashes (thanks to everyone submitting to our crash reporter!)
|
||||||
|
* Improve HTTP redirect handling (#5555)
|
||||||
|
* Blacklist: Escalate repeated soft error to normal error (#5500)
|
||||||
|
* NTFS: Do not attempt to upload two existing files with similar casing (#5533)
|
||||||
|
* Fix URL for linking to application password generation for ownCloud 10.0 (#5605)
|
||||||
|
|
||||||
version 2.3.0 (2017-03-03)
|
version 2.3.0 (2017-03-03)
|
||||||
* Decreased memory usage during sync
|
* Decreased memory usage during sync
|
||||||
* Overlay icons: Lower CPU usage
|
* Overlay icons: Lower CPU usage
|
||||||
|
|
|
@ -47,6 +47,8 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
|
||||||
|
|
||||||
a = _finalList.at(index.row());
|
a = _finalList.at(index.row());
|
||||||
AccountStatePtr ast = AccountManager::instance()->account(a._accName);
|
AccountStatePtr ast = AccountManager::instance()->account(a._accName);
|
||||||
|
if (!ast)
|
||||||
|
return QVariant();
|
||||||
QStringList list;
|
QStringList list;
|
||||||
|
|
||||||
switch (role) {
|
switch (role) {
|
||||||
|
|
|
@ -272,9 +272,6 @@ public:
|
||||||
|
|
||||||
class OwncloudPropagator : public QObject {
|
class OwncloudPropagator : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
QScopedPointer<PropagateDirectory> _rootJob;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
const QString _localDir; // absolute path to the local directory. ends with '/'
|
const QString _localDir; // absolute path to the local directory. ends with '/'
|
||||||
const QString _remoteFolder; // remote folder, ends with '/'
|
const QString _remoteFolder; // remote folder, ends with '/'
|
||||||
|
@ -406,6 +403,7 @@ signals:
|
||||||
private:
|
private:
|
||||||
|
|
||||||
AccountPtr _account;
|
AccountPtr _account;
|
||||||
|
QScopedPointer<PropagateDirectory> _rootJob;
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
||||||
// access to signals which are protected in Qt4
|
// access to signals which are protected in Qt4
|
||||||
|
|
Loading…
Reference in a new issue