summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31804 from nextcloud/backport/31782/stable23blizzz2022-04-141-1/+7
|\ | | | | [stable23] Fix ldap wizard styling
| * Fix ldap wizard stylingRichard Steinmetz2022-04-141-1/+7
| | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | Merge pull request #31540 from nextcloud/backport/31454/stable23blizzz2022-04-147-35/+148
|\ \ | | | | | | [stable23] Fix the logger that is imported for critical actions
| * | Fix the logger that is imported for critical actionsCarl Schwan2022-03-117-35/+148
| | | | | | | | | | | | | | | | | | | | | | | | This use a new interface AuditLogger that makes it easier to seperate the roles of the various loggers and enforce that we don't use the wrong one by mistake. Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* | | Merge pull request #31521 from nextcloud/backport/31491/stable23blizzz2022-04-144-7/+7
|\ \ \ | | | | | | | | [stable23] Fix duplicated UUID detection when there are empty uuids
| * | | Fix similar potential problems with fetchOne loopsCôme Chilliet2022-03-104-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | Fix duplicated UUID detection when there are empty uuidsCôme Chilliet2022-03-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | Merge pull request #31453 from nextcloud/s3-primary-ci-23blizzz2022-04-146-8/+111
|\ \ \ \ | |_|_|/ |/| | | [stable23] Run tests with primary object storage in CI + large upload fixes
| * | | also handle expired pre-write shared lock on dav upload when not using part ↵Robin Appelman2022-03-101-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | files Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | skip localstorage dependend user test when not using local user storageRobin Appelman2022-03-101-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | make share cache test resilient against skeleton files not being thereRobin Appelman2022-03-101-5/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | skip localstorage dependend trashbin test when not using local user storageRobin Appelman2022-03-101-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | return dummy availability if storage is not found in cacheRobin Appelman2022-03-101-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | run ci with primary s3 setupRobin Appelman2022-03-101-0/+70
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-1424-8/+76
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #31862 from nextcloud/update-autoloaders-and-nodeJohn Molakvoæ2022-04-13179-478/+346
|\ \ \
| * | | Update autoloaders and Node package-lock.jsonMichaIng2022-04-13179-478/+346
| | | | | | | | | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
* | | | Merge pull request #31946 from nextcloud/s3-versioning-not-implemented-23Vincent Petry2022-04-131-2/+14
|\ \ \ \ | | | | | | | | | | [23] AmazonS3: allow not implemented versioning
| * | | | AmazonS3: allow not implemented versioningErik van Velzen2022-04-121-2/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the S3 implementation does not implement versioning, set it to false. Versioning was introduced in Nexcloud in commit 09ffac5e6dd5355c9aaf49c098942fa1e4fbed25 This is needed for compatibility with the Storj gateway. Signed-off-by: Erik van Velzen <erik@evanv.nl>
* | | | Merge pull request #31940 from nextcloud/backport/31907/stable23Vincent Petry2022-04-132-0/+13
|\ \ \ \ | | | | | | | | | | [stable23] confirm user is internal to globalscale
| * | | | confirm user is internal to globalscaleMaxence Lange2022-04-122-0/+13
| |/ / / | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | Merge pull request #31846 from nextcloud/backport/31684/stable23Vincent Petry2022-04-132-11/+66
|\ \ \ \ | | | | | | | | | | [stable23] take permissions from multiple paths into account for share permissions
| * | | | take permissions from multiple paths into account for share permissionsRobin Appelman2022-04-052-11/+66
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #31955 from nextcloud/backport/31933/stable23blizzz2022-04-131-12/+12
|\ \ \ \ \ | | | | | | | | | | | | [stable23] update CRL after revocation of socialsharing_telegram.csr
| * | | | | Update root.crtVitor Mattos2022-04-131-12/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/nextcloud/app-certificate-requests/pull/515 Signed-off-by: Vitor Mattos <vitor@php.rio>
* | / / / [tx-robot] updated from transifexNextcloud bot2022-04-1354-442/+106
| |/ / / |/| | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2022-04-1254-66/+102
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #31882 from nextcloud/backport/31876/stable23Joas Schilling2022-04-111-1/+11
|\ \ \ \ | | | | | | | | | | [stable23] Fix \OC_App::getCurrentApp() when being called from CLI or phpunit
| * | | | Log exceptionJoas Schilling2022-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix \OC_App::getCurrentApp() when being called from CLI or phpunitJoas Schilling2022-04-071-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-04-1114-46/+64
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-04-108-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-04-09158-230/+322
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-04-0810-0/+10
|/ / / / | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2022-04-078-0/+66
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2022-04-0660-60/+60
|/ / / | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-0572-60/+124
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-0410-8/+52
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-0320-10/+142
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-02108-554/+160
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-04-0148-28/+42
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #31774 from nextcloud/backport/31737/stable23Louis2022-03-311-13/+24
|\ \ \ | | | | | | | | [stable23] Wrap oauth2 migrations inside conditions
| * | | Wrap oauth2 migrations inside conditionsLouis Chemineau2022-03-311-13/+24
| | | | | | | | | | | | | | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | Merge pull request #31514 from nextcloud/backport/31421/stable23Côme Chilliet2022-03-3111-147/+128
|\ \ \ \ | |/ / / |/| | | [stable23] user_ldap fix ldap connection resets #31421
| * | | Fix $baseDN parameter type in ILDAPWrapper::readCôme Chilliet2022-03-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | Inherit doc from interface in LDAP classCôme Chilliet2022-03-291-66/+22
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | Fix unit testsCôme Chilliet2022-03-2910-44/+81
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | Fix executeRead when connection is reset because of a timeoutCôme Chilliet2022-03-291-36/+24
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | [tx-robot] updated from transifexNextcloud bot2022-03-3116-74/+98
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #31740 from nextcloud/backport/stable23/31537Simon L2022-03-315-5/+176
|\ \ \ \ | | | | | | | | | | [stable23] show that the web updater is not recommended on big instances