5763ce2761
Merge pull request #21047 from nextcloud/backport/21041/stable19
...
[stable19] Copy over the ETag and LastModified when formatting a Dataresponse
2020-05-19 20:40:47 +02:00
b9cb5a74cc
Copy over the ETag and LastModified when formatting a Dataresponse
...
This way the ETag checks etc are all working.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-19 12:51:06 +00:00
822d3f0e8b
Merge pull request #21029 from nextcloud/backport/21003/stable19
...
[stable19] Remove entries from locales.json incompatible with punic
2020-05-19 12:05:06 +02:00
e003fcd806
Merge pull request #21032 from nextcloud/backport/20846/stable19
...
[stable19] Link permissions
2020-05-19 11:57:15 +02:00
dd15780edd
Fix share update test
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-05-18 13:47:39 +00:00
214221574b
Update public link share permission code
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-18 13:47:39 +00:00
aac0dd1f20
Have share permissions on link shares if it is enabled
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-18 13:47:38 +00:00
b0cfa3ed22
Remove entries from locales.json incompatible with punic
...
As reported at https://github.com/nextcloud/server/issues/20999 the list contains en_US_POSIX as locale but punic is unable to parse such a locale. If you select that locale everyone is confused.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-05-18 09:53:47 +00:00
231eaf6ffd
Merge pull request #20991 from nextcloud/backport/20941/stable19
...
[stable19] update icewind/smb to 3.2.4
2020-05-18 11:03:39 +02:00
be37ca1776
Don't load text file preview when text app is available ( Fixes : #20615 )
...
When opening a shared text document, the files_sharing app uses
internal preview support in case no other app to open the text file is
available.
So far, it only checks for the old files_texteditor app, not for the new
new text app. This commit fixes this by checking for both.
Signed-off-by: Jonas Meurer <jonas@freesources.org>
2020-05-18 08:59:53 +00:00
ffc3b48a40
update icewind/smb to 3.2.4
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-05-15 12:35:22 +00:00
9d7198f31e
Merge pull request #20963 from nextcloud/backport/20947/stable19
...
[stable19] Bump yargs-parser
2020-05-14 11:51:07 +02:00
c4b2b1ec7d
19 RC3
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-14 08:45:14 +02:00
1310836edd
Bump yargs-parser
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-14 06:43:30 +00:00
b0a7ff1a99
Merge pull request #20850 from nextcloud/version/19/rc2
...
19 RC2
2020-05-14 08:14:25 +02:00
321551a94f
19 RC2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-14 08:11:00 +02:00
60fd1a30b2
Merge pull request #20960 from nextcloud/backport/20952/stable19
...
[stable19] Respect exit code of lint run - changed from -exec to xargs as this e…
2020-05-14 08:09:04 +02:00
3d201d70ba
Merge pull request #20961 from nextcloud/backport/20958/stable19
...
[stable19] Allow links to conversations
2020-05-14 08:08:50 +02:00
e2357d5df1
Allow links to conversations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-05-13 20:14:39 +00:00
ffb4d54bc0
Respect exit code of lint run - changed from -exec to xargs as this exits properly
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-13 22:04:04 +02:00
acdd9362df
Merge pull request #20954 from nextcloud/backport/20951/stable19
...
[stable19] Trailing comma's in functin arguments break on 7.2
2020-05-13 19:46:58 +02:00
9c23d6355f
Merge pull request #20944 from nextcloud/backport/20897/stable19
...
[stable19] Proxy server could cache http response when it is not private
2020-05-13 12:48:46 +02:00
9fd725c84a
Trailing comma's in functin arguments break on 7.2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-13 10:40:31 +00:00
21f8cc584c
Fix http cache test
...
Signed-off-by: Clement Wong <git@clement.hk>
2020-05-13 06:34:22 +00:00
203d85f045
Add public argument to Http cacheFor()
...
Signed-off-by: Clement Wong <git@clement.hk>
2020-05-13 06:34:22 +00:00
1331eb1fb8
Proxy server could cache http response when it is not private
...
Signed-off-by: Clement Wong <git@clement.hk>
2020-05-13 06:34:22 +00:00
c19d639231
Merge pull request #20940 from nextcloud/backport/20858/stable19
...
[stable19] Remember the webauthn name of devices
2020-05-12 19:51:52 +02:00
8e9433aee9
Remember the webauthn name of devices
...
Fixes #20289
we should not reset to default once we have logged in with the device.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-12 12:08:38 +00:00
c37bb7745b
Merge pull request #20923 from nextcloud/backport/20915/stable19
...
[stable19] Use random_bytes
2020-05-11 21:00:16 +02:00
4bde23d239
Merge pull request #20878 from nextcloud/backport/20719/stable19
2020-05-11 14:55:16 +02:00
387af7eb60
Use random_bytes
...
Since we don't care if it is human readbale.
The code is backwards compatible with the old format.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-11 12:23:02 +00:00
6b6d28ee98
Merge pull request #20880 from nextcloud/backport/20860/stable19
...
[stable19] macOS contacts: prefer personal over app generated
2020-05-09 10:53:08 +02:00
1a58e3afbe
Merge pull request #20885 from nextcloud/backport/20853/stable19
...
[stable19] Fix color-text-maxcontrast not passing WCAG AA
2020-05-09 09:53:07 +02:00
78480def53
Fix color-text-maxcontrast not passing WCAG AA
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-05-09 01:06:14 +00:00
e048bf8550
Rename app-generated to z-app-generated, because macOS Contacts supports only one and will pick the first one alphabetically
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-05-08 10:05:56 +00:00
d1909526fc
Implement ctag and etag in ContactsInteraction
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-05-08 10:05:55 +00:00
adbdecb1d6
Fix languages empty array
...
Signed-off-by: GretaD <gretadoci@gmail.com>
2020-05-08 09:25:59 +00:00
76334c4c90
Merge pull request #20873 from nextcloud/backport/20864/stable19
...
[stable19] Install page app naming
2020-05-08 10:24:22 +02:00
3ebecaec52
Merge pull request #20872 from nextcloud/backport/20831/stable19
...
[stable19] Do not process the same FileInfo twice
2020-05-08 10:08:33 +02:00
1d6772c1be
Merge pull request #20871 from nextcloud/backport/20861/stable19
...
[stable19] Fix replacement dialog
2020-05-08 09:19:08 +02:00
4d0f008dcb
Install page app naming
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-08 06:33:11 +00:00
90a65f83e0
Do not process the same FileInfo twice
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-08 05:39:53 +00:00
3365ab787a
Fix replacement dialog
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-08 05:23:39 +00:00
3b0e581dec
Merge pull request #20823 from nextcloud/version/19/RC1
...
19 RC1
2020-05-06 21:54:36 +02:00
a07c21f630
Merge pull request #20841 from nextcloud/trashbin-locking
...
add locking to resolve concurent move to trashbin conflicts
2020-05-06 21:50:49 +02:00
07f41671b3
Merge pull request #20837 from nextcloud/bugfix/noid/fix-syntax
...
Fix syntax
2020-05-06 20:54:47 +02:00
614acc9419
add locking to resolve concurent move to trashbin conflicts
...
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-05-06 20:36:55 +02:00
06732cf2af
Merge pull request #20832 from nextcloud/fix/sharing-filter-user-shares-only-fix-group-display
...
Do not filter id matching userId on non-user-share shares
2020-05-06 17:46:21 +02:00
d5850eb28f
Merge pull request #18955 from adrb/swift_upload_large_objects
...
Large Object support for OpenStack Swift
2020-05-06 13:03:24 +02:00
9c025134b3
Fix syntax
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-05-06 10:54:36 +02:00
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
Daniel Kesselberg
Morris Jobke
Jonas Meurer
Robin Appelman
Christoph Wurst
Joas Schilling
Clement Wong
John Molakvoæ
Jan-Christoph Borchardt
Georg Ehrke
GretaD
John Molakvoæ (skjnldsv)