chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-04 17:31:01 +02:00
Code Activity
14,082 Commits 4 Branches 173 Tags
v2.7.0-beta1
Commit Graph
14082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Camila Ayres 04b5754653 Merge branch 'master' into address_sanitizer 2019-10-22 14:43:37 +02:00
Camila Ayres 44bc3692fd Merge pull request #1527 from nextcloud/qt-5.12.5-update-submodules 
Update submodules for Qt 5.12.5 (qtmacgoodies)
 2019-10-22 14:41:51 +02:00
Camila Ayres 3a310f93e0 Merge branch 'master' into qt-5.12.5-update-submodules 2019-10-22 14:31:27 +02:00
Nextcloud bot 706769026d [tx-robot] updated from transifex 2019-10-22 03:06:06 +00:00
asapelkin 704e34fa99 enabled address sanitizing for tests 
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
 2019-10-22 01:13:59 +03:00
Roeland Jago Douma a6fae36cb2 Merge pull request #1536 from nextcloud/ci/bump5.12image/libsecret 
Bump Qt5.12 image
 2019-10-21 20:27:53 +02:00
Roeland Jago Douma 4c791abafc 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>
 2019-10-21 14:50:25 +02:00
István Váradi 11e14f1726 Merge pull request #1531 from ivaradi/debian-dbus 
Add libdbus-1-dev to the build dependencies
 2019-10-21 14:03:03 +02:00
István Váradi 0273689ca9 Merge branch 'master' into debian-dbus 2019-10-21 11:39:51 +02:00
Nextcloud bot 05a56c2e8e [tx-robot] updated from transifex 2019-10-21 03:06:00 +00:00
Michael Schuster 325dd8732e Merge pull request #1487 from nextcloud/testSyncFileStatusTracker-winPath 
Fix tests for Windows platform
 2019-10-20 21:48:36 +02:00
Michael Schuster 4d5dd0f49c Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-20 21:33:19 +02:00
Michael Schuster 39d85fd008 Merge pull request #1532 from nextcloud/fix-msvc-clang-variadic-macro-warning-fix 
MSVC Fix for PR #1526: Fix clang's variadic macro warnings
 2019-10-20 13:31:01 +02:00
Michael Schuster a12164ad53 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>
 2019-10-20 12:52:52 +02:00
István Váradi 805b85a4d7 Add libdbus-1-dev to the build dependencies 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2019-10-20 10:23:49 +02:00
Nextcloud bot cacb300ffd [tx-robot] updated from transifex 2019-10-20 03:08:24 +00:00
samu-workopen 15e36c535f 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
 2019-10-19 16:11:49 +02:00
Camila Ayres b5e51c7e34 Merge pull request #1528 from nextcloud/samu-workopen-patch-1 
Update building instructions.
 2019-10-19 15:14:17 +02:00
samu-workopen e4482ef675 Replace command line Step 5 Install Homebrew 
replace brew install "qt5 --with-qtwebkit" with "install qt5" otherwise it will not work
 2019-10-19 15:06:07 +02:00
samu-workopen 09b3be25fc Update building instructions 
Added links and a description how to clone the repo
 2019-10-19 14:21:04 +02:00
Michael Schuster 7235db2793 Merge branch 'master' into qt-5.12.5-update-submodules 2019-10-19 05:43:23 +02:00
Nextcloud bot 35005e46b4 [tx-robot] updated from transifex 2019-10-19 03:04:56 +00:00
Michael Schuster abd50022d1 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>
 2019-10-19 05:04:41 +02:00
Michael Schuster e9c12c32d2 Merge pull request #1526 from JohannesLorenz/clang-variadic-macro-warning-fix 
Fix clang's variadic macro warnings
 2019-10-19 04:41:54 +02:00
Michael Schuster 8950417d37 Merge branch 'master' into clang-variadic-macro-warning-fix 2019-10-19 04:37:42 +02:00
Michael Schuster 8c6e2f84c1 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.
 2019-10-19 04:36:08 +02:00
Michael Schuster d0aec7696a Merge branch 'master' into master 2019-10-19 03:50:43 +02:00
Michael Schuster a9da2a2277 Merge pull request #1456 from andwun/fix/too-low-default-poll-interval 
Revert DEFAULT_REMOTE_POLL_INTERVAL back from 5 seconds to 30 seconds
 2019-10-19 03:48:39 +02:00
Michael Schuster 4f1e4e149f Merge branch 'master' into fix/too-low-default-poll-interval 2019-10-19 03:40:21 +02:00
Adrian Brzezinski bd25144390 Merge branch 'issue_1351' of https://github.com/adrb/desktop into issue_1351 
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
 2019-10-18 08:30:46 +02:00
Adrian Brzezinski 3d1fc20d01 Merge branch 'issue_1351' of https://github.com/adrb/desktop into issue_1351 
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
 2019-10-18 08:24:50 +02:00
adrb 921b144d06 Merge branch 'master' into issue_1351 2019-10-18 08:19:32 +02:00
Adrian Brzezinski 12d306fa85 Merge branch 'issue_1351' of https://github.com/adrb/desktop into issue_1351 2019-10-18 08:18:19 +02:00
Adrian Brzezinski 3b750895b4 * fix for issue no. 1351 
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
 2019-10-18 08:16:59 +02:00
Johannes Lorenz 8c334a1f43 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>
 2019-10-18 05:25:05 +02:00
Nextcloud bot 6db3b2fb78 [tx-robot] updated from transifex 2019-10-18 03:04:52 +00:00
Michael Schuster 5775ec1ff1 Merge pull request #1504 from nextcloud/feature/remote-wipe 
Remote wipe for RC1.
 2019-10-17 22:23:37 +02:00
Michael Schuster 32bb31a417 Merge branch 'master' into feature/remote-wipe 2019-10-17 22:05:20 +02:00
Michael Schuster 87844f5ff4 Merge pull request #1523 from nextcloud/improvement/merge-ignored-files-notification 
Merge the list of ignored files/symlinks into one Activity notification.
 2019-10-17 22:04:18 +02:00
Camila San 19491ff85f 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>
 2019-10-17 20:11:31 +02:00
Camila San 8546d53b05 Merge the list of ignored files/symlinks into one Activity notification. 
Signed-off-by: Camila San <hello@camila.codes>
 2019-10-17 18:45:33 +02:00
Adrian Brzezinski dfb20586ce * fix for issue no. 1351 2019-10-17 14:45:38 +02:00
Camila Ayres 5783c406a2 Merge branch 'master' into master 2019-10-17 13:44:07 +02:00
Camila Ayres 6c56811636 Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-17 13:37:01 +02:00
Camila Ayres 08c7be5350 Merge pull request #1520 from nextcloud/fix-mac-crash-qtmacgoodies-pr-1 
Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
 2019-10-17 13:35:58 +02:00
Michael Schuster ade9c6ce72 Merge branch 'master' into fix-mac-crash-qtmacgoodies-pr-1 2019-10-17 05:50:38 +02:00
Nextcloud bot fdefb19bdb [tx-robot] updated from transifex 2019-10-17 03:05:50 +00:00
Michael Schuster ade50d0b92 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>
 2019-10-17 04:29:33 +02:00
Michael Schuster 09bae4d6e1 Merge pull request #1478 from sryze/quit-wizard-fix 
Don't run connection wizard when quitting the application
 2019-10-16 14:01:42 +02:00
Michael Schuster 0c30d9cfe8 Merge branch 'master' into quit-wizard-fix 2019-10-16 05:19:21 +02:00