Commit Graph

56402 Commits

Author SHA1 Message Date
Lukas Reschke 61545e7a89 Increase subnet matcher
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2021-04-12 10:36:26 +00:00
Roeland Jago Douma 5517ce19ce
Merge pull request #26509 from nextcloud/backport/26230/stable20
[stable20] l10n: Add word user in FederatedShareProvider.php
2021-04-12 10:17:57 +02:00
Valdnet 1e4fc523fe l10n: Add word user in FederatedShareProvider.php
Standardizing text strings with other Nextcloud applications.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-12 06:43:54 +00:00
Nextcloud bot 0cdfea022d
[tx-robot] updated from transifex 2021-04-12 02:25:16 +00:00
Nextcloud bot 7faa8e697b
[tx-robot] updated from transifex 2021-04-11 02:25:03 +00:00
Nextcloud bot ff2a0b3126
[tx-robot] updated from transifex 2021-04-10 02:31:32 +00:00
Nextcloud bot e78e509618
[tx-robot] updated from transifex 2021-04-09 02:25:30 +00:00
Roeland Jago Douma 7022222ac2
Merge pull request #26454 from nextcloud/version/20.0.9/final
20.0.9 final
2021-04-08 14:39:29 +02:00
Roeland Jago Douma bb0966f1c7
Merge pull request #26449 from nextcloud/3rdparty/stable20/phpseclib-2.0.31
[3rdparty][stable20] phpseclib-2.0.31
2021-04-08 14:37:17 +02:00
Roeland Jago Douma a23bed0386 [3rdparty][stable20] phpseclib-2.0.31
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-08 11:47:56 +02:00
Roeland Jago Douma 96bf8a1a92 20.0.9 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-08 10:20:43 +02:00
Nextcloud bot e09760f2bc
[tx-robot] updated from transifex 2021-04-08 02:24:23 +00:00
Nextcloud bot f1fd067db1
[tx-robot] updated from transifex 2021-04-07 02:24:36 +00:00
Lukas Reschke 90386ff920
Merge pull request #26399 from nextcloud/backport/26061/stable20
[stable20] Log and continue when failing to update encryption keys during for individual files
2021-04-06 13:43:55 +02:00
Nextcloud bot 45e63c949c
[tx-robot] updated from transifex 2021-04-06 02:25:51 +00:00
Nextcloud bot ef6a2cfc8f
[tx-robot] updated from transifex 2021-04-05 02:25:05 +00:00
Nextcloud bot bc1331f2c9
[tx-robot] updated from transifex 2021-04-04 02:25:07 +00:00
Nextcloud bot 9d0c2b1984
[tx-robot] updated from transifex 2021-04-03 02:43:54 +00:00
Nextcloud bot 7eb7a91b06
[tx-robot] updated from transifex 2021-04-02 02:26:26 +00:00
Roeland Jago Douma e7948c6738
Merge pull request #26312 from nextcloud/version/20.0.9/RC1
20.0.9 RC1
2021-04-01 20:01:30 +02:00
Morris Jobke 94c8e96a1f
Merge pull request #26405 from nextcloud/backport/26403/stable20
[stable20] remove leftover debug @NoCSRFRequired introduced with #26198
2021-04-01 18:17:08 +02:00
Robin Appelman fb201a5747 remove leftover debug @NoCSRFRequired introduced with #26198
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-04-01 13:13:47 +00:00
Vincent Petry 3a1444ee71 Fix phpcs issues in encryption update
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-04-01 07:56:20 +00:00
Julius Härtl c2a072b27d Log and continue when failing to update encryption keys during for individual files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-04-01 07:56:19 +00:00
Nextcloud bot 9df8953adf
[tx-robot] updated from transifex 2021-04-01 02:24:59 +00:00
kesselb 1e3e339e69
Merge pull request #26378 from nextcloud/backport/25500/stable20
[stable20] fix(translation): replace static error message
2021-03-31 10:08:34 +02:00
Christoph Wurst 7c4fca57a5
Merge pull request #26381 from nextcloud/backport/26372/stable20
[stable20] gracefully handle deleteFromSelf when share is already gone
2021-03-31 07:43:11 +02:00
Nextcloud bot 35db1b5996
[tx-robot] updated from transifex 2021-03-31 02:25:11 +00:00
Arthur Schiwon 47abd1f37e gracefully handle deleteFromSelf when share is already gone
- handling race conditions

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-03-30 20:26:20 +00:00
Samuel 8b6706ea7d revert(comment)
Signed-off-by: Samuel <faust64@gmail.com>
2021-03-30 19:26:14 +00:00
Samuel 09a92dc7cd revert(exception): keep throwing an exception for now
Signed-off-by: Samuel <faust64@gmail.com>
2021-03-30 19:26:13 +00:00
Samuel 2703777014 fix(translation): replace static error message
as suggested by @kesselb in nextcloud/server#25490

Signed-off-by: Samuel <faust64@gmail.com>
2021-03-30 19:26:13 +00:00
Roeland Jago Douma 99e2e5f6b9
Merge pull request #26258 from nextcloud/backport/26198/stable20
[stable20] Handle limit offset and sorting in files search
2021-03-30 20:53:11 +02:00
Christoph Wurst f1cde6b4bc
Merge pull request #26364 from nextcloud/backport/26325/stable20
[stable20] Update cipher defaults
2021-03-30 11:30:52 +02:00
Nextcloud bot 60aa785092
[tx-robot] updated from transifex 2021-03-30 02:24:39 +00:00
Roeland Jago Douma dd9890c5b8
Merge pull request #26262 from nextcloud/backport/26046/stable20
[stable20] update icewind/smb to 3.4.0
2021-03-29 21:14:39 +02:00
Roeland Jago Douma f94e8f3ee4
Merge pull request #26356 from nextcloud/backport/26342/stable20
[stable20] Fix broken Calendar Event Invite email icons in Gmail by using PNGs instead of SVGs
2021-03-29 21:03:36 +02:00
J0WI f4683a5fdf Update cipher defaults
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2021-03-29 18:41:46 +00:00
dependabot-preview[bot] 9f8757de81
Merge pull request #26360 from nextcloud/dependabot/npm_and_yarn/stable20/y18n-4.0.1 2021-03-29 17:29:01 +00:00
dependabot-preview[bot] 003049108f
[Security] Bump y18n from 4.0.0 to 4.0.1
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 16:55:44 +00:00
Nick Sweeting 03df8abca3 change calendar invite emails to use pngs instead of svgs
Signed-off-by: Nick Sweeting <git@sweeting.me>
2021-03-29 16:16:33 +00:00
Nextcloud bot dae4431427
[tx-robot] updated from transifex 2021-03-29 02:24:18 +00:00
Nextcloud bot 86850feaf9
[tx-robot] updated from transifex 2021-03-28 02:24:24 +00:00
Nextcloud bot 53aa26b6c6
[tx-robot] updated from transifex 2021-03-27 02:24:47 +00:00
Morris Jobke a8c6ffaf9a
Merge pull request #26290 from nextcloud/backport/21484/stable20
[stable20] show better error messages when a file with a forbidden path is encountered
2021-03-26 13:51:02 +01:00
Roeland Jago Douma 41375184eb 20.0.9 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-26 10:32:48 +01:00
John Molakvoæ 20cb2b49e6
Merge pull request #26305 from nextcloud/backport/22201/stable20
[stable20] Delete old birthday calendar object when moving contact to another ad…
2021-03-26 08:57:48 +01:00
John Molakvoæ 2262115043
Merge pull request #26297 from nextcloud/backport/26287/stable20
[stable20] Fix l10n
2021-03-26 08:08:53 +01:00
Christian Weiske 92ac67c3d2 Delete old birthday calendar object when moving contact to another address book
When an contact is moved to another address book, the contact is copied to
the second address book.
During copying, the birthday event is created - but it gets the same UID
as the contact's birthday event in the first address book.

To prevent the "Calendar object with uid already exists" error that followed,
we need to delete the old entry before the new one is created.

Resolves: https://github.com/nextcloud/server/issues/20492
Signed-off-by: Christian Weiske <cweiske@cweiske.de>
2021-03-26 07:01:33 +00:00
Nextcloud bot 1a05043008
[tx-robot] updated from transifex 2021-03-26 02:25:53 +00:00