Nextcloud bot
bbbead5769
[tx-robot] updated from transifex
2019-11-14 03:07:51 +00:00
Michael Schuster
fca7b32405
Merge pull request #1604 from nextcloud/rakekniven-patch-1
...
l10n: Remove string from Transifex resource
2019-11-14 03:22:29 +01:00
Michael Schuster
d558af31c9
Merge pull request #1605 from nextcloud/revert-1586-qt5.5-compat
...
Revert and Fix "Remove HTTP/2 support from Xenial"
2019-11-14 03:19:09 +01:00
Michael Schuster
5131463644
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>
2019-11-14 02:39:06 +01:00
Michael Schuster
9e8498ad4e
Revert "Remove HTTP/2 support from Xenial"
2019-11-14 02:22:01 +01:00
Michael Schuster
3777ae4624
Merge pull request #1586 from ivaradi/qt5.5-compat
...
Remove HTTP/2 support from Xenial
2019-11-14 01:45:19 +01:00
rakekniven
e896c41ef9
l10n: Remove string from Transifex resource
...
Fix for #1578
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2019-11-13 18:03:22 +01:00
Nextcloud bot
9d8b8be8d2
[tx-robot] updated from transifex
2019-11-13 03:07:30 +00:00
Nextcloud bot
1c15b97b11
[tx-robot] updated from transifex
2019-11-12 03:09:20 +00:00
Nextcloud bot
8017ee45f5
[tx-robot] updated from transifex
2019-11-10 03:11:47 +00:00
Nextcloud bot
8c1e3cabe0
[tx-robot] updated from transifex
2019-11-09 03:03:34 +00:00
Michael Schuster
0c6279f86a
Merge branch 'master' into qt5.5-compat
2019-11-07 15:49:43 +01:00
Nextcloud bot
1cffa3b731
[tx-robot] updated from transifex
2019-11-07 03:06:07 +00:00
Nextcloud bot
549acb0785
[tx-robot] updated from transifex
2019-11-06 03:08:01 +00:00
István Váradi
a143b42c2a
Remove HTTP/2 support from Xenial
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-11-05 19:34:32 +01:00
Nextcloud bot
e85ad9de6a
[tx-robot] updated from transifex
2019-11-05 03:05:20 +00:00
Camila Ayres
0ab5bbb08e
Merge pull request #1522 from adrb/issue_1351
...
* fix for issue no. 1351
2019-11-04 22:48:20 +01:00
Camila Ayres
4efa282f80
Merge branch 'master' into issue_1351
2019-11-04 22:48:07 +01:00
Camila Ayres
d53cfbd9fb
Merge pull request #1573 from Milokita/master
...
Fix #1182 - upload of files with umlaut.
2019-11-04 20:21:17 +01:00
Camila Ayres
94986877d8
Merge branch 'master' into master
2019-11-04 20:20:32 +01:00
Camila Ayres
f3bc2f5e87
Merge pull request #1579 from nextcloud/fix-remote-wipe-proxy
...
Fix remote wipe when a proxy is configured.
2019-11-04 20:16:53 +01:00
Camila Ayres
a5365a6cce
Merge branch 'master' into master
2019-11-04 20:14:11 +01:00
Michael Schuster
b9ad82ceeb
Merge branch 'master' into fix-remote-wipe-proxy
2019-11-04 19:58:56 +01:00
Camila Ayres
fe959fe0d5
Merge pull request #1580 from nextcloud/fix-updater-message
...
Fix updater message: Download link instead of "use the system's updat…
2019-11-04 19:55:39 +01:00
Michael Schuster
6421397083
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>
2019-11-04 19:19:59 +01:00
Camila San
52ae354ca2
Fix remote wipe when a proxy is configured.
...
Signed-off-by: Camila San <hello@camila.codes>
2019-11-04 17:52:02 +00:00
Nextcloud bot
73af9b1cac
[tx-robot] updated from transifex
2019-11-04 03:08:04 +00:00
Nextcloud bot
cdaee7b933
[tx-robot] updated from transifex
2019-11-03 03:09:40 +00:00
Nextcloud bot
6adbd9bd50
[tx-robot] updated from transifex
2019-11-02 03:04:09 +00:00
Nextcloud bot
6acf3871e4
[tx-robot] updated from transifex
2019-11-01 02:56:47 +00:00
XNG
ead2131ba2
Merge branch 'master' of https://github.com/Milokita/desktop
2019-11-01 09:35:19 +08:00
XNG
cf1532acf1
Apply http2 patch from owncloud
...
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-11-01 09:35:10 +08:00
XNG
17ca7ab5db
Apply http2 patch from owncloud
...
Signed-off-by: XNG <Milokita@users.noreply.github.com>
2019-11-01 09:22:52 +08:00
XNG
c42332a5ee
Merge pull request #1 from nextcloud/master
...
Just some catch up
2019-11-01 08:48:06 +08:00
Nextcloud bot
c736f48ac9
[tx-robot] updated from transifex
2019-10-31 02:57:51 +00:00
Nextcloud bot
5ac203ebd8
[tx-robot] updated from transifex
2019-10-30 02:56:18 +00:00
Dominique Fuchs
d18e2ba339
Merge pull request #1429 from nextcloud/recipientnote
...
Finishing PR #1154
2019-10-29 14:49:36 +01:00
Dominique Fuchs
7ed03f1f29
resolving conflict with current master
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-29 14:07:26 +01:00
Dominique Fuchs
5301477747
Merge branch 'master' into recipientnote
2019-10-29 12:58:14 +01:00
Nextcloud bot
09c282d9ea
[tx-robot] updated from transifex
2019-10-29 03:05:48 +00:00
Nextcloud bot
f5ff69f8b3
[tx-robot] updated from transifex
2019-10-28 03:05:30 +00:00
Michael Schuster
a15cad0088
Merge pull request #1451 from nextcloud/move-rtfiles
...
Move journal files away from sync folder to standardized location
2019-10-27 18:03:49 +01:00
Michael Schuster
8e8858178b
Merge branch 'master' into move-rtfiles
2019-10-27 17:49:22 +01:00
Michael Schuster
528352ba82
Merge pull request #1449 from nextcloud/lnx-domainname-desktopfiles
...
Linux/Wayland: Updated .desktop file naming scheme
2019-10-27 17:48:28 +01:00
Michael Schuster
e54f127a06
Merge branch 'master' into lnx-domainname-desktopfiles
2019-10-27 17:30:48 +01:00
Michael Schuster
d9fd9cfef2
Merge pull request #1454 from nextcloud/syncjournal-del-prio
...
Prioritize DELETE instruction in SyncFileVector (merged trees)
2019-10-27 17:29:03 +01:00
Michael Schuster
9618500975
fix tab spacing
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:25:50 +01:00
Michael Schuster
25076f2ddc
tab formatting (just a little more ;p)
...
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-10-27 17:03:23 +01:00
Dominique Fuchs
66912071a8
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio
2019-10-27 16:56:07 +01:00
Dominique Fuchs
e9438549f4
tab formatting
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-10-27 16:55:37 +01:00
