Commit Graph

53597 Commits

Author SHA1 Message Date
Georg Ehrke d1909526fc Implement ctag and etag in ContactsInteraction
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-05-08 10:05:55 +00:00
GretaD adbdecb1d6 Fix languages empty array
Signed-off-by: GretaD <gretadoci@gmail.com>
2020-05-08 09:25:59 +00:00
Morris Jobke 76334c4c90
Merge pull request #20873 from nextcloud/backport/20864/stable19
[stable19] Install page app naming
2020-05-08 10:24:22 +02:00
Roeland Jago Douma 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
Roeland Jago Douma 1d6772c1be
Merge pull request #20871 from nextcloud/backport/20861/stable19
[stable19] Fix replacement dialog
2020-05-08 09:19:08 +02:00
Roeland Jago Douma 4d0f008dcb Install page app naming
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-08 06:33:11 +00:00
John Molakvoæ (skjnldsv) 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
Roeland Jago Douma 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
Roeland Jago Douma 3b0e581dec
Merge pull request #20823 from nextcloud/version/19/RC1
19 RC1
2020-05-06 21:54:36 +02:00
Roeland Jago Douma 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
Morris Jobke 07f41671b3
Merge pull request #20837 from nextcloud/bugfix/noid/fix-syntax
Fix syntax
2020-05-06 20:54:47 +02:00
Robin Appelman 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
Morris Jobke 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
Roeland Jago Douma 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
Joas Schilling 9c025134b3
Fix syntax
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-05-06 10:54:36 +02:00
Nextcloud bot 3bf4e7d673
[tx-robot] updated from transifex 2020-05-06 02:16:28 +00:00
John Molakvoæ (skjnldsv) 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
John Molakvoæ 32e56dee89
Merge pull request #20825 from nextcloud/fix/sharing-own-group 2020-05-05 18:06:09 +02:00
John Molakvoæ (skjnldsv) 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
Nextcloud bot 09d7854d0e
[tx-robot] updated from transifex 2020-05-05 02:16:14 +00:00
Roeland Jago Douma c1003a2f4b
19 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-04 21:16:15 +02:00
Roeland Jago Douma fe55663c56
Merge pull request #20754 from nextcloud/version/19/beta7
19 beta 7
2020-05-04 21:06:27 +02:00
Roeland Jago Douma 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
Morris Jobke afb12ddab1
Merge pull request #20794 from nextcloud/bug/noid/scssphp-compiler-notice
Apply patch for scssphp
2020-05-04 14:32:51 +02:00
John Molakvoæ (skjnldsv) 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
Morris Jobke 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
Sascha Wiswedel 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
Daniel Kesselberg 7a7df07749
Apply patch for scssphp
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-05-04 10:28:41 +02:00
Morris Jobke a93d182bac
Merge pull request #20722 from nextcloud/enh/20693/etag-capabilities
Set etag for capabilities endpoint
2020-05-04 10:22:01 +02:00
Morris Jobke 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
Morris Jobke 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
Joas Schilling afc5966558
Merge pull request #20749 from nextcloud/bug/noid/is-not-setup-via-query-false-positive
PHP 7.4 excludes the arguments from stack traces by default.
2020-05-04 09:49:50 +02:00
Nextcloud bot 43fefee847
[tx-robot] updated from transifex 2020-05-04 02:16:18 +00:00
Nextcloud bot d2f165e448
[tx-robot] updated from transifex 2020-05-03 02:16:16 +00:00
Roeland Jago Douma 0c35aaba29
Fix OC_Image new resize functions
Else the wrong mimetype might be set. Resulting in continious
regeneration of previews when browsing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-02 21:57:34 +02:00
Roeland Jago Douma 5ca0ffbcf0
Merge pull request #20779 from nextcloud/fix/noid/php-cs
Comply with php-cs for CI
2020-05-02 20:26:07 +02:00
Roeland Jago Douma 8910a1ffcb
Merge pull request #20762 from nextcloud/fix/20538/date-not-disabled
Fix expiry datepicker allowing all dates
2020-05-02 14:59:39 +02:00
Gary Kim 8dd23f9854
Fix expiry datepicker allowing all dates
vue2-datepicker expects a `disabled-date` function
rather than `not-before` and `not-after` dates.

This commit updates it so that we now provide
vue2-datepicker with a `disabled-date` function.

Signed-off-by: Gary Kim <gary@garykim.dev>
2020-05-02 18:58:41 +08:00
Gary Kim 74d40233f5
Comply with php-cs
Signed-off-by: Gary Kim <gary@garykim.dev>
2020-05-02 14:28:21 +08:00
Nextcloud bot e77e0b0e2f
[tx-robot] updated from transifex 2020-05-02 02:16:32 +00:00
Roeland Jago Douma 24bb4a05c4
Merge pull request #20771 from nextcloud/fix/sharing-reactivity
Do not process the same shares twice
2020-05-01 19:15:38 +02:00
John Molakvoæ (skjnldsv) 31172a0cd9 Process shares only once, better debug and expiration date code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-01 13:39:57 +00:00
Roeland Jago Douma 8c023a6579
Merge pull request #20767 from nextcloud/enh/argon2id-options
Apply Argon2 options for Argon2id hashing as well
2020-05-01 15:39:13 +02:00
Roeland Jago Douma 91487d8739
Merge pull request #20759 from nextcloud/up/education-bundle
Update education bundle
2020-05-01 13:34:39 +02:00
Roeland Jago Douma 80372a3ce1
Merge pull request #20716 from nextcloud/index-propertypath
Add index to properties table
2020-05-01 12:39:34 +02:00
Roeland Jago Douma 055fa998cd
Merge pull request #20761 from nextcloud/fix/owner_public
Fix owner on publicownerwrapper
2020-05-01 12:32:14 +02:00
MichaIng 229570badf
Apply Argon2 options for Argon2id hashing as well
Signed-off-by: MichaIng <micha@dietpi.com>
2020-05-01 11:42:13 +02:00
Roeland Jago Douma b7b7b2872c
Fix owner on publicownerwrapper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-01 10:50:26 +02:00
Roeland Jago Douma a41ad78408
Update education bundle
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-01 09:52:58 +02:00
Roeland Jago Douma c724eb24d5
Merge pull request #20380 from nextcloud/design/notification-mails
Fix design and layout of notification mails
2020-05-01 08:53:39 +02:00