summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20823 from nextcloud/version/19/RC1v19.0.0RC1Roeland Jago Douma2020-05-061-2/+2
|\ | | | | 19 RC1
| * 19 RC1Roeland Jago Douma2020-05-041-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20841 from nextcloud/trashbin-lockingRoeland Jago Douma2020-05-062-21/+81
|\ \ | | | | | | add locking to resolve concurent move to trashbin conflicts
| * | add locking to resolve concurent move to trashbin conflictsRobin Appelman2020-05-062-21/+81
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #20837 from nextcloud/bugfix/noid/fix-syntaxMorris Jobke2020-05-061-1/+1
|\ \ \ | |/ / |/| | Fix syntax
| * | Fix syntaxJoas Schilling2020-05-061-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #20832 from ↵Morris Jobke2020-05-064-8/+10
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/sharing-filter-user-shares-only-fix-group-display Do not filter id matching userId on non-user-share shares
| * | | Do not filter id matching userId on non-user-share sharesJohn Molakvoæ (skjnldsv)2020-05-054-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #18955 from adrb/swift_upload_large_objectsRoeland Jago Douma2020-05-061-4/+14
|\ \ \ \ | |_|/ / |/| | | Large Object support for OpenStack Swift
| * | | Large Object support for OpenStack Swift.Adrian Brzezinski2020-04-271-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, you wouldn't be able to create objects larger that 5GB. It's somewhat related with pull #18883 Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-066-2/+52
| |/ / |/| |
* | | Merge pull request #20825 from nextcloud/fix/sharing-own-groupJohn Molakvoæ2020-05-053-22/+24
|\ \ \
| * | | Fix filtering our owner & current user from sharesJohn Molakvoæ (skjnldsv)2020-05-053-22/+24
|/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | / [tx-robot] updated from transifexNextcloud bot2020-05-0524-18/+284
| |/ |/|
* | Merge pull request #20754 from nextcloud/version/19/beta7v19.0.0beta7Roeland Jago Douma2020-05-041-2/+2
|\ \ | | | | | | 19 beta 7
| * | 19 beta 7Roeland Jago Douma2020-04-301-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20726 from nextcloud/fix/sharing-link-default-permissionsRoeland Jago Douma2020-05-049-67/+8500
|\ \ \ | | | | | | | | Fix federated link sharing permissions
| * | | Fix federated link sharing permissionsJohn Molakvoæ (skjnldsv)2020-05-049-67/+8500
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #20794 from nextcloud/bug/noid/scssphp-compiler-noticeMorris Jobke2020-05-041-0/+0
|\ \ \ \ | | | | | | | | | | Apply patch for scssphp
| * | | | Apply patch for scssphpDaniel Kesselberg2020-05-041-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #20807 from nextcloud/wiswedel/trashbinRetentionClarificationMorris Jobke2020-05-041-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | clarified trash bin retention by storage shortage override in config.sample.php
| * | | | clarified trash bin retention by storage shortage overrideSascha Wiswedel2020-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | Merge pull request #20722 from nextcloud/enh/20693/etag-capabilitiesMorris Jobke2020-05-042-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Set etag for capabilities endpoint
| * | | | | Set etag for capabilities endpointDaniel Kesselberg2020-04-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #20787 from nextcloud/fix/resize_wrong_mimeMorris Jobke2020-05-041-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix OC_Image new resize functions
| * | | | | | Fix OC_Image new resize functionsRoeland Jago Douma2020-05-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else the wrong mimetype might be set. Resulting in continious regeneration of previews when browsing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #19124 from nextcloud/bug/13647/ignore-delete-groupsMorris Jobke2020-05-041-73/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Exclude groups from sharing: Skip delete groups
| * | | | | | | Ignore delete groupsDaniel Kesselberg2020-04-241-73/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | Merge pull request #20749 from ↵Joas Schilling2020-05-041-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bug/noid/is-not-setup-via-query-false-positive PHP 7.4 excludes the arguments from stack traces by default.
| * | | | | | | | composer run cs:fixDaniel Kesselberg2020-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | PHP 7.4 excludes the arguments from stack traces by default.Daniel Kesselberg2020-04-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That leads to a false positive is not setup via query() but directly warning for every app because the check does not work anymore. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-05-0410-2/+18
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-05-0324-22/+68
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #20779 from nextcloud/fix/noid/php-csRoeland Jago Douma2020-05-021-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Comply with php-cs for CI
| * | | | | | | Comply with php-csGary Kim2020-05-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | | Merge pull request #20762 from nextcloud/fix/20538/date-not-disabledRoeland Jago Douma2020-05-025-10/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix expiry datepicker allowing all dates
| * | | | | | | Fix expiry datepicker allowing all datesGary Kim2020-05-025-10/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-05-02180-104/+1056
| | | | | | |
* | | | | | | Merge pull request #20771 from nextcloud/fix/sharing-reactivityRoeland Jago Douma2020-05-015-22/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not process the same shares twice
| * | | | | | | Process shares only once, better debug and expiration date codeJohn Molakvoæ (skjnldsv)2020-05-015-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | Merge pull request #20767 from nextcloud/enh/argon2id-optionsRoeland Jago Douma2020-05-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Apply Argon2 options for Argon2id hashing as well
| * | | | | | | Apply Argon2 options for Argon2id hashing as wellMichaIng2020-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
* | | | | | | | Merge pull request #20759 from nextcloud/up/education-bundleRoeland Jago Douma2020-05-012-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update education bundle
| * | | | | | | | Update education bundleRoeland Jago Douma2020-05-012-4/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #20716 from nextcloud/index-propertypathRoeland Jago Douma2020-05-013-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add index to properties table
| * | | | | | | | Add index to properties tableMario Danic2020-04-303-0/+22
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mario Danic <mario@lovelyhq.com>
* | | | | | | | Merge pull request #20761 from nextcloud/fix/owner_publicRoeland Jago Douma2020-05-011-0/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix owner on publicownerwrapper
| * | | | | | | Fix owner on publicownerwrapperRoeland Jago Douma2020-05-011-0/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #20380 from nextcloud/design/notification-mailsRoeland Jago Douma2020-05-015-327/+282
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix design and layout of notification mails
| * | | | | | | Fix notification mail testsJan-Christoph Borchardt2020-05-015-273/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 07:58:15 +0000