Michael Schuster [Sat, 16 Nov 2019 21:09:36 +0000 (22:09 +0100)]
Merge pull request #1617 from nextcloud/appimageQt-5.12.5
Upgrade for Qt 5.12.5 in docker-ci
Michael Schuster [Sat, 16 Nov 2019 20:53:25 +0000 (21:53 +0100)]
Fix dir in upload script
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Sat, 16 Nov 2019 20:36:59 +0000 (21:36 +0100)]
Make AppImage upload optional and add timeout
Moves the upload into a separate Drone command and adds a timeout for curl
to fail after 15 minutes.
Returns zero to keep Drone from failing.
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Sat, 16 Nov 2019 20:34:13 +0000 (21:34 +0100)]
Move .desktop file path to new env var to avoid duplicates
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Sat, 16 Nov 2019 20:31:07 +0000 (21:31 +0100)]
Upgrade for Qt 5.12.5 in docker-ci
- Use the new image: nextcloudci/client-5.12:client-5.12-5
- Use it's new QT_BASE_DIR: /opt/qt5.12.5
Signed-off-by: Michael Schuster <michael@schuster.ms>
Nextcloud bot [Sat, 16 Nov 2019 03:06:41 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 15 Nov 2019 03:07:58 +0000 (03:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 14 Nov 2019 03:07:51 +0000 (03:07 +0000)]
[tx-robot] updated from transifex
Michael Schuster [Thu, 14 Nov 2019 02:22:29 +0000 (03:22 +0100)]
Merge pull request #1604 from nextcloud/rakekniven-patch-1
l10n: Remove string from Transifex resource
Michael Schuster [Thu, 14 Nov 2019 02:19:09 +0000 (03:19 +0100)]
Merge pull request #1605 from nextcloud/revert-1586-qt5.5-compat
Revert and Fix "Remove HTTP/2 support from Xenial"
Michael Schuster [Thu, 14 Nov 2019 01:39:06 +0000 (02:39 +0100)]
Fix: Apply http2 patch from owncloud #1573 - only with Qt >= 5.8
Drone builds failed with Qt 5.7 and we introduce a new ifdef here
to avoid patching specifically for Ubuntu Xenial only.
Signed-off-by: Michael Schuster <michael@schuster.ms>
Michael Schuster [Thu, 14 Nov 2019 01:22:01 +0000 (02:22 +0100)]
Revert "Remove HTTP/2 support from Xenial"
Michael Schuster [Thu, 14 Nov 2019 00:45:19 +0000 (01:45 +0100)]
Merge pull request #1586 from ivaradi/qt5.5-compat
Remove HTTP/2 support from Xenial
rakekniven [Wed, 13 Nov 2019 17:03:22 +0000 (18:03 +0100)]
l10n: Remove string from Transifex resource
Fix for #1578
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
Nextcloud bot [Wed, 13 Nov 2019 03:07:30 +0000 (03:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 12 Nov 2019 03:09:20 +0000 (03:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Nov 2019 03:11:47 +0000 (03:11 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Nov 2019 03:03:34 +0000 (03:03 +0000)]
[tx-robot] updated from transifex
Michael Schuster [Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)]
Merge branch 'master' into qt5.5-compat
Nextcloud bot [Thu, 7 Nov 2019 03:06:07 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Nov 2019 03:08:01 +0000 (03:08 +0000)]
[tx-robot] updated from transifex
István Váradi [Tue, 5 Nov 2019 18:20:45 +0000 (19:20 +0100)]
Remove HTTP/2 support from Xenial
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
Nextcloud bot [Tue, 5 Nov 2019 03:05:20 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
Camila Ayres [Mon, 4 Nov 2019 21:48:20 +0000 (22:48 +0100)]
Merge pull request #1522 from adrb/issue_1351
* fix for issue no. 1351
Camila Ayres [Mon, 4 Nov 2019 21:48:07 +0000 (22:48 +0100)]
Merge branch 'master' into issue_1351
Camila Ayres [Mon, 4 Nov 2019 19:21:17 +0000 (20:21 +0100)]
Merge pull request #1573 from Milokita/master
Fix #1182 - upload of files with umlaut.
Camila Ayres [Mon, 4 Nov 2019 19:20:32 +0000 (20:20 +0100)]
Merge branch 'master' into master
Camila Ayres [Mon, 4 Nov 2019 19:16:53 +0000 (20:16 +0100)]
Merge pull request #1579 from nextcloud/fix-remote-wipe-proxy
Fix remote wipe when a proxy is configured.
Camila Ayres [Mon, 4 Nov 2019 19:14:11 +0000 (20:14 +0100)]
Merge branch 'master' into master
Michael Schuster [Mon, 4 Nov 2019 18:58:56 +0000 (19:58 +0100)]
Merge branch 'master' into fix-remote-wipe-proxy
Camila Ayres [Mon, 4 Nov 2019 18:55:39 +0000 (19:55 +0100)]
Merge pull request #1580 from nextcloud/fix-updater-message
Fix updater message: Download link instead of "use the system's updat…
Michael Schuster [Mon, 4 Nov 2019 18:19:59 +0000 (19:19 +0100)]
Fix updater message: Download link instead of "use the system's update tool"
Provide a download link to the new version instead of the confusing message that
users should use their "system's update tool to install it".
Signed-off-by: Michael Schuster <michael@schuster.ms>
Camila San [Mon, 4 Nov 2019 17:43:52 +0000 (17:43 +0000)]
Fix remote wipe when a proxy is configured.
Signed-off-by: Camila San <hello@camila.codes>
Nextcloud bot [Mon, 4 Nov 2019 03:08:04 +0000 (03:08 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Nov 2019 03:09:40 +0000 (03:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 2 Nov 2019 03:04:09 +0000 (03:04 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Nov 2019 02:56:47 +0000 (02:56 +0000)]
[tx-robot] updated from transifex
XNG [Fri, 1 Nov 2019 01:35:19 +0000 (09:35 +0800)]
Merge branch 'master' of https://github.com/Milokita/desktop
XNG [Fri, 1 Nov 2019 01:22:52 +0000 (09:22 +0800)]
Apply http2 patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
XNG [Fri, 1 Nov 2019 01:22:52 +0000 (09:22 +0800)]
Apply http2 patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
XNG [Fri, 1 Nov 2019 00:48:06 +0000 (08:48 +0800)]
Merge pull request #1 from nextcloud/master
Just some catch up
Nextcloud bot [Thu, 31 Oct 2019 02:57:51 +0000 (02:57 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Oct 2019 02:56:18 +0000 (02:56 +0000)]
[tx-robot] updated from transifex
Dominique Fuchs [Tue, 29 Oct 2019 13:49:36 +0000 (14:49 +0100)]
Merge pull request #1429 from nextcloud/recipientnote
Finishing PR #1154
Dominique Fuchs [Tue, 29 Oct 2019 13:07:26 +0000 (14:07 +0100)]
resolving conflict with current master
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Dominique Fuchs [Tue, 29 Oct 2019 11:58:14 +0000 (12:58 +0100)]
Merge branch 'master' into recipientnote
Nextcloud bot [Tue, 29 Oct 2019 03:05:48 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Oct 2019 03:05:30 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
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
Michael Schuster [Sun, 27 Oct 2019 16:49:22 +0000 (17:49 +0100)]
Merge branch 'master' into move-rtfiles
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
Michael Schuster [Sun, 27 Oct 2019 16:30:48 +0000 (17:30 +0100)]
Merge branch 'master' into lnx-domainname-desktopfiles
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)
Michael Schuster [Sun, 27 Oct 2019 16:25:50 +0000 (17:25 +0100)]
fix tab spacing
Signed-off-by: Michael Schuster <michael@schuster.ms>
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>
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
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>
Dominique Fuchs [Sun, 27 Oct 2019 14:43:41 +0000 (15:43 +0100)]
Merge branch 'master' into move-rtfiles
Dominique Fuchs [Sun, 27 Oct 2019 14:38:43 +0000 (15:38 +0100)]
Merge branch 'master' into syncjournal-del-prio
Nextcloud bot [Sun, 27 Oct 2019 03:04:17 +0000 (03:04 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Oct 2019 03:05:59 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 25 Oct 2019 03:06:12 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 24 Oct 2019 03:05:27 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
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)
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>
Michael Schuster [Wed, 23 Oct 2019 20:45:55 +0000 (22:45 +0200)]
Merge pull request #1553 from nextcloud/jospoortvliet-patch-1
Update 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.
Nextcloud bot [Wed, 23 Oct 2019 03:05:14 +0000 (03:05 +0000)]
[tx-robot] updated from transifex
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
Camila Ayres [Tue, 22 Oct 2019 13:08:01 +0000 (15:08 +0200)]
Merge branch 'master' into samu-workopen-patch-2-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
Camila Ayres [Tue, 22 Oct 2019 12:59:45 +0000 (14:59 +0200)]
Merge branch 'master' into samu-workopen-patch-1
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
Camila Ayres [Tue, 22 Oct 2019 12:43:37 +0000 (14:43 +0200)]
Merge branch 'master' into address_sanitizer
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)
Camila Ayres [Tue, 22 Oct 2019 12:31:27 +0000 (14:31 +0200)]
Merge branch 'master' into qt-5.12.5-update-submodules
Nextcloud bot [Tue, 22 Oct 2019 03:06:06 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
asapelkin [Mon, 21 Oct 2019 21:01:22 +0000 (00:01 +0300)]
enabled address sanitizing for tests
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
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
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>
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
István Váradi [Mon, 21 Oct 2019 09:39:51 +0000 (11:39 +0200)]
Merge branch 'master' into debian-dbus
Nextcloud bot [Mon, 21 Oct 2019 03:06:00 +0000 (03:06 +0000)]
[tx-robot] updated from transifex
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
Michael Schuster [Sun, 20 Oct 2019 19:33:19 +0000 (21:33 +0200)]
Merge branch 'master' into testSyncFileStatusTracker-winPath
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
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>
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>
Nextcloud bot [Sun, 20 Oct 2019 03:08:24 +0000 (03:08 +0000)]
[tx-robot] updated from transifex
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
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.
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
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
Michael Schuster [Sat, 19 Oct 2019 03:43:23 +0000 (05:43 +0200)]
Merge branch 'master' into qt-5.12.5-update-submodules
Nextcloud bot [Sat, 19 Oct 2019 03:04:56 +0000 (03:04 +0000)]
[tx-robot] updated from transifex
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>
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
Michael Schuster [Sat, 19 Oct 2019 02:37:42 +0000 (04:37 +0200)]
Merge branch 'master' into clang-variadic-macro-warning-fix
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.
Michael Schuster [Sat, 19 Oct 2019 01:50:43 +0000 (03:50 +0200)]
Merge branch 'master' into master
projects / nextcloud-desktop.git / log