summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #34394 from nextcloud/release/25.0.0_rc3v25.0.0rc3blizzz2022-10-061-2/+2
|\ | | | | 25.0.0 RC3
| * 25.0.0 RC3Arthur Schiwon2022-10-031-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #34432 from nextcloud/backport/34298/stable25Simon L2022-10-0518-77/+131
|\ \ | | | | | | [stable25] Use color preset of shipped background as primary color
| * | Use brand color for background only and keep accessible color as color primaryChristopher Ng2022-10-0512-19/+45
| | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | Use color preset of shipped background as primary colorChristopher Ng2022-10-059-63/+91
| | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | Merge pull request #34434 from nextcloud/backport/32635/stable25blizzz2022-10-052-3/+10
|\ \ \ | | | | | | | | [stable25] Fix User profile picture when performing the search
| * | | Update ContactsStoreTest.phpAndy Xheli2022-10-051-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | Update lib/private/Contacts/ContactsMenu/ContactsStore.php Andy Xheli2022-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com> Tested no issues. Co-authored-by: Pytal <24800714+Pytal@users.noreply.github.com> Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | Update ContactsStore.phpAndy Xheli2022-10-051-1/+1
| | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | Apply suggestions from code review Andy Xheli2022-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com> Co-authored-by: Carl Schwan <carl@carlschwan.eu> Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | Fix User profile picture when performing the searchAndy Xheli2022-10-051-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com> Before ![image](https://user-images.githubusercontent.com/59488153/140980158-b9108161-57ab-48b4-ae6f-98ec4e72775a.png) After Fix for #31065
* | | Merge pull request #34370 from nextcloud/backport/34364/stable25blizzz2022-10-051-2/+2
|\ \ \ | | | | | | | | [stable25] also use updatedir for cleanup of backups
| * | | also use updatedir for cleanup of backupsArthur Schiwon2022-10-011-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #34405 from nextcloud/backport/34302/stable25blizzz2022-10-051-17/+29
|\ \ \ \ | |_|/ / |/| | | [stable25] Fix: Prevent deadlocks during mtime/size/etag propagation
| * | | Fix unencrypted size calculation for files created before the Encryption ↵raul2022-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | storage is enabled Signed-off-by: raul <raul@nextcloud.com>
| * | | Fix: Prevent deadlocks during mtime/size/etag propagationraul2022-10-031-17/+29
| | | | | | | | | | | | | | | | Signed-off-by: raul <raul@nextcloud.com>
* | | | Merge pull request #34409 from nextcloud/backport/33566/stable25blizzz2022-10-044-4/+40
|\ \ \ \ | | | | | | | | | | [stable25] trigger a rescan when trying to fopen a file that exists in cache but not on disk
| * | | | trigger a rescan when trying to fopen a file that exists in cache but not on ↵Robin Appelman2022-10-032-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disk Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add test for trying to fopen a file which no longer exists on diskRobin Appelman2022-10-032-2/+21
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #34413 from nextcloud/backport/34350/stable25blizzz2022-10-032-2/+14
|\ \ \ \ | | | | | | | | | | [stable25] Add a capability for the reference API and expose the regex to clients
| * | | | Add a capability for the reference API and expose the regex to clientsJoas Schilling2022-10-032-2/+14
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #34408 from nextcloud/backport/34396/stable25Julius Härtl2022-10-038-11/+25
|\ \ \ \ | |/ / / |/| | | [stable25] Fix positioning of the public page footer
| * | | fix footerszaimen2022-10-035-8/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | Fix positioning of the public page footerJulius Härtl2022-10-033-3/+3
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #34382 from nextcloud/backport/34339/stable25blizzz2022-10-031-1/+1
|\ \ \ | | | | | | | | [stable25] Fix URLs on reference resolving
| * | | Fix URLs on reference resolvingJoas Schilling2022-10-021-1/+1
| | |/ | |/| | | | | | | | | | | | | The vue-richtext app currently sends leading spaces if they are in the text. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #34380 from nextcloud/backport/34289/stable25blizzz2022-10-031-1/+1
|\ \ \ | | | | | | | | [stable25] Url encode the web dav url for copying
| * | | Url encode the web dav url for copyingAnna Larch2022-10-021-1/+1
| |/ / | | | | | | | | | Signed-off-by: Anna Larch <anna@nextcloud.com>
* | | Merge pull request #34374 from nextcloud/backport/34219/stable25blizzz2022-10-031-8/+8
|\ \ \ | | | | | | | | [stable25] Add fallback options for contacts array
| * | | Add fallback options for contacts arrayAnna Larch2022-10-021-8/+8
| |/ / | | | | | | | | | | | | | | | when the UID or FN is null, the email address / dsiplay name will be used instead Signed-off-by: Anna Larch <anna@nextcloud.com>
* | | Merge pull request #34371 from nextcloud/backport/34343/stable25blizzz2022-10-031-0/+1
|\ \ \ | | | | | | | | [stable25] Fix missing maintenance mode header for OCS request
| * | | Fix missing maintenance mode header for OCS requestChristoph Wurst2022-10-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #34357 from nextcloud/backport/34353/stable25blizzz2022-10-032-3/+3
|\ \ \ \ | |_|/ / |/| | | [stable25] Reference url can always fallback to the link itself
| * | | reference url can always fallback to the link itselfJulien Veyssier2022-09-302-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | Merge pull request #34373 from nextcloud/backport/34331/stable25Simon L2022-10-028-18/+17
|\ \ \ \ | |_|/ / |/| | | [stable25] fix public view
| * | | Compile assetsnextcloud-command2022-10-016-12/+12
| | | | | | | | | | | | | | | | Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | fix public view - attempt 2szaimen2022-10-012-6/+5
|/ / / | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | Merge pull request #34365 from nextcloud/backport/34363/stable25blizzz2022-10-016-0/+0
|\ \ \ | | | | | | | | [stable25] Update OpenDyslexia to v0.91.12
| * | | Update opendyslexiaJoas Schilling2022-10-016-0/+0
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #34354 from nextcloud/backport/34348/stable25blizzz2022-10-013-8/+3
|\ \ \ | |_|/ |/| | [stable25] Fix renaming in shared with you file list
| * | Fix renaming in shared with you file listVincent Petry2022-09-303-8/+3
| |/ | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | Merge pull request #34367 from nextcloud/backport/34323/stable25John Molakvoæ2022-10-016-0/+0
|\ \ | | | | | | [stable25] Update theming screenshots
| * | Update theming screenshotsJohn Molakvoæ (skjnldsv)2022-10-016-0/+0
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #34356 from nextcloud/backport/34333/stable25Simon L2022-10-012-4/+4
|\ \ | | | | | | [stable25] fix the tertiary button text
| * | fix testszaimen2022-09-301-2/+2
| | | | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
| * | fix the tertiary button textszaimen2022-09-301-2/+2
| |/ | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | Merge pull request #34332 from nextcloud/backport/34327/stable25Simon L2022-10-017-11/+17
|\ \ | |/ |/| [stable25] Fix starred favourite icon
| * Fix starred favourite iconJohn Molakvoæ (skjnldsv)2022-09-297-11/+17
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #34340 from nextcloud/backport/34328/stable25blizzz2022-09-302-2/+2
|\ \ | | | | | | [stable25] Correctly handle Redis::keys returning false
| * | Correctly handle Redis::keys returning falseCôme Chilliet2022-09-302-2/+2
|/ / | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 15:09:49 +0000