summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix conflictsGit'Fellow2023-05-041-1/+6
| | | | | | | | | Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
| * | [BUGFIX] throw exception instead of error if unable to create file handler ↵Jan Messer2023-05-041-0/+4
| | | | | | | | | | | | | | | | | | (only exceptions are catch) Signed-off-by: Jan Messer <jan@mtec-studios.ch>
| * | [BUGFIX] check return value and improve error handlingJan Messer2023-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | | With S3 primary storage there was a problem with getting the CA bundle from the storage without having the CA bundle for the connection which causes that the CertificateManager was throwing an Error. This commit improves the handling in CertificateManager and log unexpected behaviors. Signed-off-by: Jan Messer <jan@mtec-studios.ch>
* | | Merge pull request #37769 from nextcloud/backport/36217/stable25Arthur Schiwon2023-05-174-10/+15
|\ \ \ | | | | | | | | [stable25] Handle reminders where calendar name is null
| * | | Handle reminders where calendar name is nullThomas Citharel2023-04-214-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an interface change, but that's not a public API. We're handling this in the providers and not in ReminderService because the fallback is translated with the user's language. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #38074 from nextcloud/stable25-fix-a11y-files-settingsArthur Schiwon2023-05-174-4/+7
|\ \ \ \ | | | | | | | | | | [stable25] Add required accessibility attributes to legacy files navigation
| * | | | Add required accessibility attributes to legacy files navigationFerdinand Thiessen2023-05-154-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: John Molakvoæ <skjnldsv@users.noreply.github.com> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
* | | | | Merge pull request #38132 from nextcloud/backport/36895/stable25Git'Fellow2023-05-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [stable25] Fix json_decode expecting a string
| * | | | | Update Checker.phpIlya Apasov2023-05-091-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Ilya Apasov <apasov@users.noreply.github.com>
* | | | | | Merge pull request #37850 from nextcloud/backport/37834/stable25Arthur Schiwon2023-05-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable25] Fix TypeError in Profiler
| * | | | | | Fix TypeError in ProfilerCôme Chilliet2023-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | Merge pull request #37832 from nextcloud/backport/37807/stable25Arthur Schiwon2023-05-171-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable25] Fix background color of external devices with errors on dark color theme
| * | | | | | | fix(files_external): Background color of external devices with errors should ↵Ferdinand Thiessen2023-04-201-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respect color theme Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
* | | | | | | Merge pull request #38249 from ↵Christoph Wurst2023-05-171-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/read-only-system-addres-book-acls-stable25 [stable25] fix(carddav): Mark system address book as read-only
| * | | | | | | fix(carddav): Mark system address book as read-onlyChristoph Wurst2023-05-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #37702 from nextcloud/backport/37617/stable25Arthur Schiwon2023-05-172-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable25] handle not being able to write file for notify self-test
| * | | | | | | | handle not being able to write file for notify self-testRobin Appelman2023-04-132-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #37569 from nextcloud/backport/34375/stable25Arthur Schiwon2023-05-171-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [stable25] fix(dav) Handle Calendar trashbin UID conflicts by removing the deleted calendar object
| * | | | | | | | | Allow reimporting prev. deleted items by deleting trashbin itemAnna Larch2023-04-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Anna Larch <anna@nextcloud.com>
* | | | | | | | | | Merge pull request #37307 from nextcloud/backport/37006/stable25Arthur Schiwon2023-05-171-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [stable25] also unmark deleted ldap user when checking the ldap entry
| * | | | | | | | | | also unmark deleted ldap user when checking the ldap entryRobin Appelman2023-03-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | | Merge pull request #37720 from nextcloud/backport/37697/stable25Joas Schilling2023-05-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [stable25] Fix button text
| * | | | | | | | | | | Fix button textChristopher Ng2023-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> (cherry picked from commit 3b94da9c1d9869db35cf8b33da82119d93c1402f)
* | | | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2023-05-1730-56/+118
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | | Merge pull request #38325 from nextcloud/backport/38303/stable25Simon L2023-05-164-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [stable25] fix(search): fix load more
| * | | | | | | | | | | fix backportSimon L2023-05-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | | | | | | | | | fix(search): fix load moreJohn Molakvoæ2023-05-161-4/+4
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | | | | | | | | | | Merge pull request #38305 from nextcloud/backport/38143/stable25Simon L2023-05-162-10/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | [stable25] Fix generated avatars cache
| * | | | | | | | | | adjust patchjld31032023-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: jld3103 <jld3103yt@gmail.com>
| * | | | | | | | | | adjust patch Simon L2023-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: Simon L. <szaimen@e.mail.de>
| * | | | | | | | | | Clear generated avatar cachesjld31032023-05-162-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: jld3103 <jld3103yt@gmail.com>
| * | | | | | | | | | Properly clear cached avatarsjld31032023-05-161-7/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: jld3103 <jld3103yt@gmail.com>
* | | | | | | | | | Merge pull request #38276 from nextcloud/backport/38274/stable25Joas Schilling2023-05-162-4/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [stable25] fix(middleware): Also abort the request when reaching max delay in af…
| * | | | | | | | | | fix(middleware): Also abort the request when reaching max delay in ↵Joas Schilling2023-05-152-4/+12
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afterController Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Merge pull request #38258 from nextcloud/backport/38242/stable25Simon L2023-05-165-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [stable25] Fix incosistent scrolling in Firefox
| * | | | | | | | | | Fix incosistent scrolling in FirefoxSimon L2023-05-155-2/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | | | | | Merge pull request #38269 from nextcloud/backport/38267/stable25Joas Schilling2023-05-162-13/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [stable25] fix(lostpassword): Also rate limit the setPassword endpoint
| * | | | | | | | | | fix(tests): Adjust unit testsJoas Schilling2023-05-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | | fix(lostpassword): Also rate limit the setPassword endpointJoas Schilling2023-05-151-5/+11
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2023-05-1610-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | Merge pull request #38282 from nextcloud/session-auth-check-username-25Robin Appelman2023-05-151-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [25] check the username when doing external storage session auth
| * | | | | | | | | check the username when doing external storage session authRobin Appelman2023-05-151-0/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #38203 from nextcloud/backport/36893/stable25Côme Chilliet2023-05-152-9/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [stable25] Make sure to never trigger files hooks on a null path
| * | | | | | | | | Make sure to never trigger files hooks on a null pathCôme Chilliet2023-05-112-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | | | | Merge pull request #38236 from ↵Côme Chilliet2023-05-152-37/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/automated/noid/stable25-update-psalm-baseline [stable25] Update psalm-baseline.xml
| * | | | | | | | | Update psalm baselinenextcloud-command2023-05-152-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | | | | | | Merge pull request #38239 from nextcloud/backport/37709/stable25Julius Härtl2023-05-152-2/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix: Check for wrapped retriable exceptionsJulius Härtl2023-05-132-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2023-05-1512-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | | Fix(l10n): Update translations from TransifexNextcloud bot2023-05-1434-0/+100
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>