summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Also backport the cacert to stable25Joas Schilling2022-10-111-1/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2022-10-1112-24/+58
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #30608 from nextcloud/harden-fonctLouis2022-10-101-5/+5
|\ | | | | Harden disk_free_space check in CheckSetupController
| * Harden some PHP functionsacsfer2022-10-041-5/+5
| | | | | | | | | | | | To avoid things like https://github.com/nextcloud/server/issues/26034 Signed-off-by: Louis Chemineau <louis@chmn.me>
* | Merge pull request #34488 from nextcloud/typehint_closuresCarl Schwan2022-10-101-4/+5
|\ \ | | | | | | typehint migrationservice closures
| * | typehint migrationservice closuresRoeland Jago Douma2022-10-091-4/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #34489 from nextcloud/type_closureCarl Schwan2022-10-101-1/+1
|\ \ \ | | | | | | | | type closure to make psalm a bit happier
| * | | type closure to make psalm a bit happierRoeland Jago Douma2022-10-091-1/+1
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #34487 from nextcloud/psalm_fix_migration_generationCarl Schwan2022-10-101-4/+4
|\ \ \ | | | | | | | | fix typehints for generated migrations
| * | | properly typehint generated migrationsRoeland Jago Douma2022-10-091-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #33915 from ↵Simon L2022-10-107-103/+68
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/enh/33914-replace_expiration_date_picker_with_native_date_picker Replace vue2-datepicker with native date picker for share expiration dates
| * | | Replace moment.js date with Date Object.julia.kirschenheuter2022-10-067-103/+68
| | |/ | |/| | | | | | | | | | | | | | | | Replace vue2-datepicker with native date picker for expiration date. Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-10-0940-78/+202
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-10-0842-136/+184
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #34462 from ↵blizzz2022-10-071-3/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/automated/noid/master-update-psalm-baseline [master] Update psalm-baseline.xml
| * | | Update psalm baselinenextcloud-command2022-10-071-3/+0
|/ / / | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-10-0742-42/+184
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #31947 from andyxheli/patch-1blizzz2022-10-061-1/+0
|\ \ \ | | | | | | | | Fix Error: Undefined index: redirect_url
| * | | Fix Error: Undefined index: redirect_urlAndy Xheli2022-04-121-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com> Should fix Undefined index: redirect_url at core/templates/twofactorsetupselection.php #21968
* | | | Merge pull request #34415 from nextcloud/fix/caldav-backend-causal-readsChristoph Wurst2022-10-061-20/+29
|\ \ \ \ | | | | | | | | | | Fix causal reads in CalDAV backend
| * | | | Fix causal reads in CalDAV backendChristoph Wurst2022-10-031-20/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #34401 from ↵Joas Schilling2022-10-061-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/file-reference-no-preview-fallback-image File reference: fallback icon to file type if no preview
| * | | | | File reference: use the file type icon as fallback when no preview provider ↵Julien Veyssier2022-10-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for this type Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-10-0640-110/+110
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #34400 from nextcloud/enhancement/passwordless-auth-loggingCôme Chilliet2022-10-051-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Pass logger to passwordless auth WebAuthn lib
| * | | | | Pass logger to passwordless auth WebAuthn libChristoph Wurst2022-10-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #32635 from andyxheli/patch-3blizzz2022-10-052-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix User profile picture when performing the search
| * | | | | | Update ContactsStoreTest.phpAndy Xheli2022-10-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | | | | Update lib/private/Contacts/ContactsMenu/ContactsStore.php Andy Xheli2022-09-201-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-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andy Xheli <axheli@axtsolutions.com>
| * | | | | | Apply suggestions from code review Andy Xheli2022-09-161-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-05-271-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 #34298 from nextcloud/enh/shipped-background-colorsSimon L2022-10-0518-77/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2022-10-0524-42/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | Merge pull request #34378 from nextcloud/add-isDeleted-to-icalendarblizzz2022-10-042-0/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Add isDeleted to OCP\Calendar\ICalendar
| * | | | | | Add isDeleted property to OCP\Calendar\ICalendarThomas Citharel2022-10-032-0/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | Merge pull request #34412 from ↵Christoph Wurst2022-10-041-13/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/create-address-book-write-read-transactional Wrap address book creation causal read in a transaction
| * | | | | | Wrap address book creation write-read in a transactionChristoph Wurst2022-10-031-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #34421 from nextcloud/bugfix/noid/fix-typo-in-deprecatedblizzz2022-10-043-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Fix typo in deprecated
| * | | | | | Fix typo in deprecatedJoas Schilling2022-10-043-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | / / / / [tx-robot] updated from transifexNextcloud bot2022-10-046-20/+20
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #34350 from ↵Joas Schilling2022-10-032-2/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/bugfix/34278/add-capability-for-the-reference-api 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-012-2/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #34396 from nextcloud/bugfix/noid/public-page-footerSimon L2022-10-038-11/+25
|\ \ \ \ \ | | | | | | | | | | | | 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 #34302 from nextcloud/fix/propagation_deadlock_handlingRobin Appelman2022-10-031-17/+29
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | 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>