nextcloud-desktop.git
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Oct 2019 03:05:30 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1451 from nextcloud/move-rtfiles
Michael Schuster [Sun, 27 Oct 2019 17:03:49 +0000 (18:03 +0100)]
Merge pull request #1451 from nextcloud/move-rtfiles

Move journal files away from sync folder to standardized location

6 years agoMerge branch 'master' into move-rtfiles
Michael Schuster [Sun, 27 Oct 2019 16:49:22 +0000 (17:49 +0100)]
Merge branch 'master' into move-rtfiles

6 years agoMerge pull request #1449 from nextcloud/lnx-domainname-desktopfiles
Michael Schuster [Sun, 27 Oct 2019 16:48:28 +0000 (17:48 +0100)]
Merge pull request #1449 from nextcloud/lnx-domainname-desktopfiles

Linux/Wayland: Updated .desktop file naming scheme

6 years agoMerge branch 'master' into lnx-domainname-desktopfiles
Michael Schuster [Sun, 27 Oct 2019 16:30:48 +0000 (17:30 +0100)]
Merge branch 'master' into lnx-domainname-desktopfiles

6 years agoMerge pull request #1454 from nextcloud/syncjournal-del-prio
Michael Schuster [Sun, 27 Oct 2019 16:29:03 +0000 (17:29 +0100)]
Merge pull request #1454 from nextcloud/syncjournal-del-prio

Prioritize DELETE instruction in SyncFileVector (merged trees)

6 years agofix tab spacing
Michael Schuster [Sun, 27 Oct 2019 16:25:50 +0000 (17:25 +0100)]
fix tab spacing

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agotab formatting (just a little more ;p)
Michael Schuster [Sun, 27 Oct 2019 16:03:23 +0000 (17:03 +0100)]
tab formatting (just a little more ;p)

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into...
Dominique Fuchs [Sun, 27 Oct 2019 15:56:07 +0000 (16:56 +0100)]
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio

6 years agotab formatting
Dominique Fuchs [Sun, 27 Oct 2019 15:55:37 +0000 (16:55 +0100)]
tab formatting

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
6 years agoMerge branch 'master' into move-rtfiles
Dominique Fuchs [Sun, 27 Oct 2019 14:43:41 +0000 (15:43 +0100)]
Merge branch 'master' into move-rtfiles

6 years agoMerge branch 'master' into syncjournal-del-prio
Dominique Fuchs [Sun, 27 Oct 2019 14:38:43 +0000 (15:38 +0100)]
Merge branch 'master' into syncjournal-del-prio

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Oct 2019 03:04:17 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Oct 2019 03:05:59 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 25 Oct 2019 03:06:12 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 24 Oct 2019 03:05:27 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1554 from sryze/fix-duplicate-apps
Michael Schuster [Wed, 23 Oct 2019 21:44:54 +0000 (23:44 +0200)]
Merge pull request #1554 from sryze/fix-duplicate-apps

Fix duplicate items in Apps menu (a bug introduced in #1477)

6 years agoFix duplicate items in Apps menu (a bug introduced in #1477)
Sergey Zolotarev [Wed, 23 Oct 2019 20:50:58 +0000 (02:50 +0600)]
Fix duplicate items in Apps menu (a bug introduced in #1477)

Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
6 years agoMerge pull request #1553 from nextcloud/jospoortvliet-patch-1
Michael Schuster [Wed, 23 Oct 2019 20:45:55 +0000 (22:45 +0200)]
Merge pull request #1553 from nextcloud/jospoortvliet-patch-1

Update ChangeLog

6 years agoUpdate ChangeLog
Jos Poortvliet [Wed, 23 Oct 2019 19:30:40 +0000 (21:30 +0200)]
Update ChangeLog

Link to https://github.com/nextcloud/desktop/releases as there's no plan to keep the changelog file up to date.

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 23 Oct 2019 03:05:14 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1529 from nextcloud/samu-workopen-patch-2-1
Camila Ayres [Tue, 22 Oct 2019 13:08:11 +0000 (15:08 +0200)]
Merge pull request #1529 from nextcloud/samu-workopen-patch-2-1

Replace command line Step 5 Install Homebrew

6 years agoMerge branch 'master' into samu-workopen-patch-2-1
Camila Ayres [Tue, 22 Oct 2019 13:08:01 +0000 (15:08 +0200)]
Merge branch 'master' into samu-workopen-patch-2-1

6 years agoMerge pull request #1530 from nextcloud/samu-workopen-patch-1
Camila Ayres [Tue, 22 Oct 2019 13:01:58 +0000 (15:01 +0200)]
Merge pull request #1530 from nextcloud/samu-workopen-patch-1

Update Installing Mac Step 11

6 years agoMerge branch 'master' into samu-workopen-patch-1
Camila Ayres [Tue, 22 Oct 2019 12:59:45 +0000 (14:59 +0200)]
Merge branch 'master' into samu-workopen-patch-1

6 years agoMerge pull request #1544 from asapelkin/address_sanitizer
Camila Ayres [Tue, 22 Oct 2019 12:59:33 +0000 (14:59 +0200)]
Merge pull request #1544 from asapelkin/address_sanitizer

Enabled address sanitizing for tests

6 years agoMerge branch 'master' into address_sanitizer
Camila Ayres [Tue, 22 Oct 2019 12:43:37 +0000 (14:43 +0200)]
Merge branch 'master' into address_sanitizer

6 years agoMerge pull request #1527 from nextcloud/qt-5.12.5-update-submodules
Camila Ayres [Tue, 22 Oct 2019 12:41:51 +0000 (14:41 +0200)]
Merge pull request #1527 from nextcloud/qt-5.12.5-update-submodules

Update submodules for Qt 5.12.5 (qtmacgoodies)

6 years agoMerge branch 'master' into qt-5.12.5-update-submodules
Camila Ayres [Tue, 22 Oct 2019 12:31:27 +0000 (14:31 +0200)]
Merge branch 'master' into qt-5.12.5-update-submodules

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 22 Oct 2019 03:06:06 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years agoenabled address sanitizing for tests
asapelkin [Mon, 21 Oct 2019 21:01:22 +0000 (00:01 +0300)]
enabled address sanitizing for tests

Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
6 years agoMerge pull request #1536 from nextcloud/ci/bump5.12image/libsecret
Roeland Jago Douma [Mon, 21 Oct 2019 18:27:53 +0000 (20:27 +0200)]
Merge pull request #1536 from nextcloud/ci/bump5.12image/libsecret

Bump Qt5.12 image

6 years agoBump Qt5.12 image
Roeland Jago Douma [Mon, 21 Oct 2019 12:50:25 +0000 (14:50 +0200)]
Bump Qt5.12 image

Main improvement is that this image contains the libsecret.
So when building qtkeychain that should be used.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #1531 from ivaradi/debian-dbus
István Váradi [Mon, 21 Oct 2019 12:03:03 +0000 (14:03 +0200)]
Merge pull request #1531 from ivaradi/debian-dbus

Add libdbus-1-dev to the build dependencies

6 years agoMerge branch 'master' into debian-dbus
István Váradi [Mon, 21 Oct 2019 09:39:51 +0000 (11:39 +0200)]
Merge branch 'master' into debian-dbus

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 21 Oct 2019 03:06:00 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1487 from nextcloud/testSyncFileStatusTracker-winPath
Michael Schuster [Sun, 20 Oct 2019 19:48:36 +0000 (21:48 +0200)]
Merge pull request #1487 from nextcloud/testSyncFileStatusTracker-winPath

Fix tests for Windows platform

6 years agoMerge branch 'master' into testSyncFileStatusTracker-winPath
Michael Schuster [Sun, 20 Oct 2019 19:33:19 +0000 (21:33 +0200)]
Merge branch 'master' into testSyncFileStatusTracker-winPath

6 years agoMerge pull request #1532 from nextcloud/fix-msvc-clang-variadic-macro-warning-fix
Michael Schuster [Sun, 20 Oct 2019 11:31:01 +0000 (13:31 +0200)]
Merge pull request #1532 from nextcloud/fix-msvc-clang-variadic-macro-warning-fix

MSVC Fix for PR #1526: Fix clang's variadic macro warnings

6 years agoMSVC Fix for PR #1526: Fix clang's variadic macro warnings
Michael Schuster [Sun, 20 Oct 2019 10:52:52 +0000 (12:52 +0200)]
MSVC Fix for PR #1526: Fix clang's variadic macro warnings

The recently merged #1526 caused the MSVC Builds on Windows to fail.

This patch sets the new CMake flag only if the compiler it not MSVC.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoAdd libdbus-1-dev to the build dependencies
István Váradi [Sun, 20 Oct 2019 08:18:27 +0000 (10:18 +0200)]
Add libdbus-1-dev to the build dependencies

Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 20 Oct 2019 03:08:24 +0000 (03:08 +0000)]
[tx-robot] updated from transifex

6 years agoUpdate Step 11
samu-workopen [Sat, 19 Oct 2019 14:11:49 +0000 (16:11 +0200)]
Update Step 11

Step 11 is completely outdated, please replace it with:
Enable git submodules:
$ cd desktop
$ git submodule init
$ git submodule update
Generate the build files:
$ cd build
$ cmake .. -DCMAKE_INSTALL_PREFIX=~/nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1

6 years agoMerge pull request #1528 from nextcloud/samu-workopen-patch-1
Camila Ayres [Sat, 19 Oct 2019 13:14:17 +0000 (15:14 +0200)]
Merge pull request #1528 from nextcloud/samu-workopen-patch-1

Update building instructions.

6 years agoReplace command line Step 5 Install Homebrew
samu-workopen [Sat, 19 Oct 2019 13:06:07 +0000 (15:06 +0200)]
Replace command line Step 5 Install Homebrew

  replace brew install "qt5 --with-qtwebkit" with "install qt5" otherwise it will not work

6 years agoUpdate building instructions
samu-workopen [Sat, 19 Oct 2019 12:21:04 +0000 (14:21 +0200)]
Update building instructions

Added links and a description how to clone the repo

6 years agoMerge branch 'master' into qt-5.12.5-update-submodules
Michael Schuster [Sat, 19 Oct 2019 03:43:23 +0000 (05:43 +0200)]
Merge branch 'master' into qt-5.12.5-update-submodules

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 19 Oct 2019 03:04:56 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years agoUpdate submodules for Qt 5.12.5 (qtmacgoodies)
Michael Schuster [Sat, 19 Oct 2019 03:04:41 +0000 (05:04 +0200)]
Update submodules for Qt 5.12.5 (qtmacgoodies)

Fetch the new submodule commits to get these fixes:
- Merge upstream: Retrieve the associated NSView more reliably: https://github.com/camilasan/qtmacgoodies/pull/1
- Bugfix for Qt 5.12.5 - Redraw the ToolBar: https://github.com/camilasan/qtmacgoodies/pull/2

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge pull request #1526 from JohannesLorenz/clang-variadic-macro-warning-fix
Michael Schuster [Sat, 19 Oct 2019 02:41:54 +0000 (04:41 +0200)]
Merge pull request #1526 from JohannesLorenz/clang-variadic-macro-warning-fix

Fix clang's variadic macro warnings

6 years agoMerge branch 'master' into clang-variadic-macro-warning-fix
Michael Schuster [Sat, 19 Oct 2019 02:37:42 +0000 (04:37 +0200)]
Merge branch 'master' into clang-variadic-macro-warning-fix

6 years agoMerge pull request #1471 from tintou/master
Michael Schuster [Sat, 19 Oct 2019 02:36:08 +0000 (04:36 +0200)]
Merge pull request #1471 from tintou/master

Build with libcloudproviders on debian and in the AppImage

NOTE:
The admin/linux/Dockerfile is outdated and the following repo is currently used for our daily builds:
https://github.com/nextcloud/docker-ci/tree/master/client

This fix will be added there soon too.

6 years agoMerge branch 'master' into master
Michael Schuster [Sat, 19 Oct 2019 01:50:43 +0000 (03:50 +0200)]
Merge branch 'master' into master

6 years agoMerge pull request #1456 from andwun/fix/too-low-default-poll-interval
Michael Schuster [Sat, 19 Oct 2019 01:48:39 +0000 (03:48 +0200)]
Merge pull request #1456 from andwun/fix/too-low-default-poll-interval

Revert DEFAULT_REMOTE_POLL_INTERVAL back from 5 seconds to 30 seconds

6 years agoMerge branch 'master' into fix/too-low-default-poll-interval
Michael Schuster [Sat, 19 Oct 2019 01:40:21 +0000 (03:40 +0200)]
Merge branch 'master' into fix/too-low-default-poll-interval

6 years agoFix clang's variadic macro warnings
Johannes Lorenz [Fri, 18 Oct 2019 03:17:23 +0000 (05:17 +0200)]
Fix clang's variadic macro warnings

Using variadic macros like `qCWarning()` without any parameter for "..."
is a GNU extension, which causes a lot of `clang` warnings:

```
desktop/src/common/ownsql.cpp:74:24: warning: must specify at least one
 argument for '...' parameter of variadic macro
 [-Wgnu-zero-variadic-macro-arguments]
        qCWarning(lcSql) << "Error:" << _error << "for" << filename;
                       ^
/usr/include/qt/QtCore/qloggingcategory.h:140:11: note: macro 'qCWarning'
 defined here
          ^
```

This patch tells `clang` to be silent.

Signed-off-by: Johannes Lorenz <j.git@lorenz-ho.me>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 18 Oct 2019 03:04:52 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1504 from nextcloud/feature/remote-wipe
Michael Schuster [Thu, 17 Oct 2019 20:23:37 +0000 (22:23 +0200)]
Merge pull request #1504 from nextcloud/feature/remote-wipe

Remote wipe for RC1.

6 years agoMerge branch 'master' into feature/remote-wipe
Michael Schuster [Thu, 17 Oct 2019 20:05:20 +0000 (22:05 +0200)]
Merge branch 'master' into feature/remote-wipe

6 years agoMerge pull request #1523 from nextcloud/improvement/merge-ignored-files-notification
Michael Schuster [Thu, 17 Oct 2019 20:04:18 +0000 (22:04 +0200)]
Merge pull request #1523 from nextcloud/improvement/merge-ignored-files-notification

Merge the list of ignored files/symlinks into one Activity notification.

6 years agoOnce client gets 401/403 from the server, check if remote wipe was requested.
Camila San [Wed, 24 Jul 2019 11:56:21 +0000 (13:56 +0200)]
Once client gets 401/403 from the server, check if remote wipe was requested.

- When the the users logs because of 401 or 403 errors, it checks if the
server requested the remote wipe. If yes, locally deletes account and folders
connected to the account and notify the server. If no, proceeds to ask the
user to login again.
- The app password is restored in the keychain.
- WIP: The change also includes a test class for RemoteWipe.

Signed-off-by: Camila San <hello@camila.codes>
6 years agoMerge the list of ignored files/symlinks into one Activity notification.
Camila San [Thu, 17 Oct 2019 16:45:33 +0000 (18:45 +0200)]
Merge the list of ignored files/symlinks into one Activity notification.

Signed-off-by: Camila San <hello@camila.codes>
6 years agoMerge branch 'master' into master
Camila Ayres [Thu, 17 Oct 2019 11:44:07 +0000 (13:44 +0200)]
Merge branch 'master' into master

6 years agoMerge branch 'master' into testSyncFileStatusTracker-winPath
Camila Ayres [Thu, 17 Oct 2019 11:37:01 +0000 (13:37 +0200)]
Merge branch 'master' into testSyncFileStatusTracker-winPath

6 years agoMerge pull request #1520 from nextcloud/fix-mac-crash-qtmacgoodies-pr-1
Camila Ayres [Thu, 17 Oct 2019 11:35:58 +0000 (13:35 +0200)]
Merge pull request #1520 from nextcloud/fix-mac-crash-qtmacgoodies-pr-1

Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930

6 years agoMerge branch 'master' into fix-mac-crash-qtmacgoodies-pr-1
Michael Schuster [Thu, 17 Oct 2019 03:50:38 +0000 (05:50 +0200)]
Merge branch 'master' into fix-mac-crash-qtmacgoodies-pr-1

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 17 Oct 2019 03:05:50 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoPick from upstream: Update qtmacgoodies for an OSX crash fix #6930
Michael Schuster [Thu, 17 Oct 2019 02:24:04 +0000 (04:24 +0200)]
Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930

With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS.

For reference please see:
- https://github.com/owncloud/client/issues/6930
- https://github.com/guruz/qtmacgoodies/commit/0dc7bc33282bdf3ea262cbd1e6c380a8ab9d6dcf

For the required changes in the qtmacgoodies submodule see:
https://github.com/camilasan/qtmacgoodies/pull/1

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge pull request #1478 from sryze/quit-wizard-fix
Michael Schuster [Wed, 16 Oct 2019 12:01:42 +0000 (14:01 +0200)]
Merge pull request #1478 from sryze/quit-wizard-fix

Don't run connection wizard when quitting the application

6 years agoMerge branch 'master' into quit-wizard-fix
Michael Schuster [Wed, 16 Oct 2019 03:19:21 +0000 (05:19 +0200)]
Merge branch 'master' into quit-wizard-fix

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 16 Oct 2019 03:04:57 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years agoMerge branch 'master' into quit-wizard-fix
Michael Schuster [Wed, 16 Oct 2019 02:43:41 +0000 (04:43 +0200)]
Merge branch 'master' into quit-wizard-fix

6 years agoMerge pull request #1516 from nextcloud/backport/1515/master
Michael Schuster [Tue, 15 Oct 2019 23:44:49 +0000 (01:44 +0200)]
Merge pull request #1516 from nextcloud/backport/1515/master

[master] Add new "styles" plugin to macOS deployment script for Qt 5.12.5

6 years agoAdd new "styles" plugin to macOS deployment script for Qt 5.12.5
Michael Schuster [Mon, 14 Oct 2019 00:01:56 +0000 (02:01 +0200)]
Add new "styles" plugin to macOS deployment script for Qt 5.12.5

Qt 5.12 needs this library to use the correct style for Light / Dark Mode:

  styles/libqmacstyle.dylib

The interface looks like from the 1990's without this library ;-)

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 15 Oct 2019 03:04:26 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 13 Oct 2019 03:05:59 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 12 Oct 2019 03:05:06 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 11 Oct 2019 03:02:18 +0000 (03:02 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1495 from nextcloud/fix-flow2-content-length
Michael Schuster [Thu, 10 Oct 2019 06:08:26 +0000 (08:08 +0200)]
Merge pull request #1495 from nextcloud/fix-flow2-content-length

Add a 'Content-Length: 0' header to initial POST requests

6 years agoAdd a 'Content-Length: 0' header to initial POST requests
Michael Schuster [Thu, 10 Oct 2019 03:17:22 +0000 (05:17 +0200)]
Add a 'Content-Length: 0' header to initial POST requests

The webserver lighttpd rejected POST requests without a Content-length
header with "411 Length Required".

See: https://github.com/nextcloud/desktop/issues/1473

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge pull request #1481 from asapelkin/for_loop_optimization
Michael Schuster [Wed, 9 Oct 2019 23:30:40 +0000 (01:30 +0200)]
Merge pull request #1481 from asapelkin/for_loop_optimization

 Avoiding copying in range-based loops

6 years agoMerge pull request #1441 from nextcloud/trexcl
Michael Schuster [Wed, 9 Oct 2019 23:29:57 +0000 (01:29 +0200)]
Merge pull request #1441 from nextcloud/trexcl

Fixed missing 'translatable' exclusions, added missing window titles

6 years agoMerge branch 'master' into for_loop_optimization
Michael Schuster [Wed, 9 Oct 2019 23:12:57 +0000 (01:12 +0200)]
Merge branch 'master' into for_loop_optimization

6 years agoMerge branch 'master' into trexcl
Michael Schuster [Wed, 9 Oct 2019 23:12:48 +0000 (01:12 +0200)]
Merge branch 'master' into trexcl

6 years agoMerge pull request #1032 from k1l1/master
Michael Schuster [Wed, 9 Oct 2019 23:09:01 +0000 (01:09 +0200)]
Merge pull request #1032 from k1l1/master

Changed max GUI bandwidth limits

6 years agoFix outdated link to server admin docs
Michael Schuster [Wed, 9 Oct 2019 23:03:46 +0000 (01:03 +0200)]
Fix outdated link to server admin docs

Sets the target version from "15" to "latest" and removes
"index.html" because this could get obsolete in the future too.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge branch 'master' into master
Michael Schuster [Wed, 9 Oct 2019 22:45:04 +0000 (00:45 +0200)]
Merge branch 'master' into master

6 years agoMerge branch 'master' into for_loop_optimization
Michael Schuster [Wed, 9 Oct 2019 22:41:46 +0000 (00:41 +0200)]
Merge branch 'master' into for_loop_optimization

6 years agoMerge branch 'master' into quit-wizard-fix
Dominique Fuchs [Wed, 9 Oct 2019 07:18:26 +0000 (09:18 +0200)]
Merge branch 'master' into quit-wizard-fix

6 years agoReplace isQuitting flag with disconnect()
Sergey Zolotarev [Wed, 9 Oct 2019 05:07:00 +0000 (11:07 +0600)]
Replace isQuitting flag with disconnect()

Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 9 Oct 2019 03:04:39 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years agoMerge branch 'master' into for_loop_optimization
Dominique Fuchs [Tue, 8 Oct 2019 08:36:25 +0000 (10:36 +0200)]
Merge branch 'master' into for_loop_optimization

6 years agoMerge branch 'testSyncFileStatusTracker-winPath' of https://github.com/nextcloud...
Dominique Fuchs [Tue, 8 Oct 2019 06:44:23 +0000 (08:44 +0200)]
Merge branch 'testSyncFileStatusTracker-winPath' of https://github.com/nextcloud/desktop into testSyncFileStatusTracker-winPath

6 years agoDon't need a second if for non-Windows, using Qt macro for platform check
Dominique Fuchs [Tue, 8 Oct 2019 06:44:08 +0000 (08:44 +0200)]
Don't need a second if for non-Windows, using Qt macro for platform check

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
6 years agoMerge branch 'master' into testSyncFileStatusTracker-winPath
Dominique Fuchs [Tue, 8 Oct 2019 06:37:29 +0000 (08:37 +0200)]
Merge branch 'master' into testSyncFileStatusTracker-winPath

6 years agoFixed typo preventing successful path rename on Win and modified ASSERT for Window...
Dominique Fuchs [Tue, 8 Oct 2019 06:31:31 +0000 (08:31 +0200)]
Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 8 Oct 2019 03:03:10 +0000 (03:03 +0000)]
[tx-robot] updated from transifex

6 years agoMerge branch 'master' into for_loop_optimization
asapelkin [Mon, 7 Oct 2019 12:31:01 +0000 (15:31 +0300)]
Merge branch 'master' into for_loop_optimization

6 years agoMerge pull request #1477 from sryze/tray-menu-fix
Camila Ayres [Mon, 7 Oct 2019 10:53:28 +0000 (12:53 +0200)]
Merge pull request #1477 from sryze/tray-menu-fix

Prevent jumping of tray menu

6 years agoMerge branch 'master' into for_loop_optimization
asapelkin [Mon, 7 Oct 2019 09:35:18 +0000 (12:35 +0300)]
Merge branch 'master' into for_loop_optimization