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
3bf4e7d673
[tx-robot] updated from transifex
2020-05-06 02:16:28 +00:00
a26ca1e638
Do not filter id matching userId on non-user-share shares
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-05 21:36:46 +02:00
32e56dee89
Merge pull request #20825 from nextcloud/fix/sharing-own-group
2020-05-05 18:06:09 +02:00
edecd0931e
Fix filtering our owner & current user from shares
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-05 10:28:33 +00:00
09d7854d0e
[tx-robot] updated from transifex
2020-05-05 02:16:14 +00:00
c1003a2f4b
19 RC1
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-04 21:16:15 +02:00
fe55663c56
Merge pull request #20754 from nextcloud/version/19/beta7
...
19 beta 7
2020-05-04 21:06:27 +02:00
edb19cc381
Merge pull request #20726 from nextcloud/fix/sharing-link-default-permissions
...
Fix federated link sharing permissions
2020-05-04 21:04:52 +02:00
afb12ddab1
Merge pull request #20794 from nextcloud/bug/noid/scssphp-compiler-notice
...
Apply patch for scssphp
2020-05-04 14:32:51 +02:00
ff20da637e
Fix federated link sharing permissions
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-04 11:48:11 +00:00
2c256de257
Merge pull request #20807 from nextcloud/wiswedel/trashbinRetentionClarification
...
clarified trash bin retention by storage shortage override in config.sample.php
2020-05-04 13:37:29 +02:00
a85191330b
clarified trash bin retention by storage shortage override
...
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
2020-05-04 13:25:05 +02:00
7a7df07749
Apply patch for scssphp
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-05-04 10:28:41 +02:00
a93d182bac
Merge pull request #20722 from nextcloud/enh/20693/etag-capabilities
...
Set etag for capabilities endpoint
2020-05-04 10:22:01 +02:00
e102264299
Merge pull request #20787 from nextcloud/fix/resize_wrong_mime
...
Fix OC_Image new resize functions
2020-05-04 10:06:16 +02:00
6aceb39714
Merge pull request #19124 from nextcloud/bug/13647/ignore-delete-groups
...
Exclude groups from sharing: Skip delete groups
2020-05-04 10:02:32 +02:00
Roeland Jago Douma
Joas Schilling
Morris Jobke
Roeland Jago Douma
Clement Wong
John Molakvoæ
Jan-Christoph Borchardt
Georg Ehrke
GretaD
John Molakvoæ (skjnldsv)
Robin Appelman
Nextcloud bot
Sascha Wiswedel
Daniel Kesselberg