Commit Graph

2285 Commits

Author SHA1 Message Date
Søren Kottal
bc803ae78b Fix RTE block rendering failing (#15583)
Adds optional class attribute to regex responsible for parsing RTE values to block models
2024-01-19 13:22:46 +01:00
Sven Geusens
9da46462f7 Run the same cleanup with scaffolding content as when copying. (#15541)
* Run the same cleanup with scaffolding content as when copying.

- Added a new ContentScaffoldedNotification
- Published the notification when a new scaffold has been created from a blueprint (content template)
- Linked up the ComplextPEContent handler to do the same cleanup for the new notification as when copying.
- registered handlers to the event for blocklist, blockgrid and nested content

* PR pattern matching suggestion

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
(cherry picked from commit dff90c6ec0)
2024-01-10 12:27:11 +01:00
Bjarke Berg
23341c8f35 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-12-22 14:06:50 +01:00
Bjarke Berg
4489cf45d1 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-22 14:06:05 +01:00
Bjarke Berg
91e37b80e3 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-12-22 14:05:12 +01:00
Sven Geusens
812b414d96 Batched more update calls to avoid Sql paramater count error (#15487)
Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-12-21 09:43:37 +01:00
Sven Geusens
78850087f8 Added a temporary DataCollector for v14 editorAlias migrations (#15463)
* Added a temporary DataCollector for v14 editorAlias migrations

* PR feedback

Do not run the collector on subscribers or non running instances
Reduced logger noise

* Extra v14 sanity check

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-12-19 14:18:10 +01:00
Bjarke Berg
bf498b411c RebuildOnStartupHandler should not inject ExamineIndexRebuilder, but only the interface (#15465) 2023-12-18 06:58:12 +01:00
Nikolaj Geisle
8ecc5552ab Merge branch 'release/13.0' into v13/dev
# Conflicts:
#	version.json
2023-12-14 16:33:27 +01:00
Nikolaj Geisle
c930b91ede 13: Add old databasemodel to ChangeLogStatusCode migration (#15454)
* Add old model to migration and use that instead

* Remove new column
2023-12-14 11:44:55 +01:00
Bjarke Berg
38879e11df Merge remote-tracking branch 'origin/release/13.0' into v13/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
#	version.json
2023-12-13 10:44:10 +01:00
Bjarke Berg
8a9e6ee82d Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	global.json
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html
#	src/Umbraco.Core/EmbeddedResources/Lang/da.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/fr.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
#	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/RecurringBackgroundJobHostedServiceRunner.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
#	src/Umbraco.Web.UI/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs
#	version.json
2023-12-13 09:55:34 +01:00
Bjarke Berg
4e12f1e4e6 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-13 09:36:25 +01:00
Bjarke Berg
923c98a29f Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
2023-12-13 09:31:54 +01:00
Nikolaj Geisle
b3caf747df Merge pull request from GHSA-6324-52pr-h4p5
Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-12-12 15:56:13 +01:00
Zeegaan
497927303f Suppress flow when queueing background threads 2023-12-12 15:55:05 +01:00
Jacob Overgaard
6f123224de V13: Regression with global window.uui export (#15412)
* revert change to load commonjs version of uui

* revert to load uui

* build login first

* build login assets as iife to support loading inside the backoffice
2023-12-12 12:03:49 +01:00
Kenn Jacobsen
fa0b8c7b4d Ensure thread safety for block editor constructor caches (#15425) 2023-12-12 09:55:56 +01:00
Bjarke Berg
fe6d6f7156 Post fix 2023-12-11 16:43:21 +01:00
Bjarke Berg
4a0d364d10 Post fix 2023-12-11 16:33:56 +01:00
Bjarke Berg
5dfa76600a Post fix 2023-12-11 16:32:38 +01:00
Bjarke Berg
4b78fabd54 Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
2023-12-11 14:41:17 +01:00
Bjarke Berg
bab22d8b5f Merge remote-tracking branch 'origin/release/12.3.4' into release/13.0
# Conflicts:
#	version.json
2023-12-11 14:39:32 +01:00
Bjarke Berg
9f375ede65 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-11 14:37:36 +01:00
Nikolaj Geisle
3331788c5c Merge pull request from GHSA-8qp8-9rpw-j46c
* Ensure that missing access rules do not break the site (#15081)

(cherry picked from commit 6777145079)

* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
2023-12-11 13:59:35 +01:00
Nikolaj Geisle
50a107f885 Merge pull request from GHSA-6324-52pr-h4p5
Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-12-11 13:59:03 +01:00
Nikolaj Geisle
13cc320f19 Merge pull request from GHSA-6324-52pr-h4p5
* Bump version

* Fix https://github.com/umbraco/Umbraco-CMS/security/advisories/GHSA-6324-52pr-h4p5

* Fix https://github.com/umbraco/Umbraco-CMS/security/advisories/GHSA-6324-52pr-h4p5

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-12-11 13:59:03 +01:00
Zeegaan
3a697d90fc Suppress flow when queueing background threads 2023-12-11 12:44:06 +01:00
Zeegaan
b5544aa520 Suppress flow when queueing background threads 2023-12-11 12:43:25 +01:00
Ronald Barendse
406848b76f Remove date header from webhook request and use constants (#15407)
* Remove date header

* Move webhook event header names to constants
2023-12-11 08:49:37 +01:00
Sebastiaan Janssen
6f582451ed Merge branch 'release/13.0' into v13/dev
# Conflicts:
#	version.json
2023-12-08 15:54:06 +01:00
Bjarke Berg
cf2ec50d15 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev
# Conflicts:
#	version.json
2023-12-08 13:34:41 +01:00
Nikolaj Geisle
b50353b238 V13: Log webhook firing exceptions when they happen (#15393)
* Refactor Webhook logging to handle exceptions

* Add Exception occured property to WebhookLog.
2023-12-07 14:25:26 +01:00
Nikolaj Geisle
80a6ec44ba Migrate url columms to NVarCharMax (#15331) 2023-12-07 10:26:55 +01:00
Nikolaj Geisle
4ff2572d78 Use named HttpClients (#15375)
* Use named HttpClients

* Register as named client

* Set headers on request message.

* Add User agent header to http client

* Add headers within Try-catch

* Add using for HttpResponseMessage

* Update src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Update src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

* Log key instead of entire webhook

* Update src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Create constant for User agent header name

* Update src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Use datetime.now

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
2023-12-07 09:51:44 +01:00
Sebastiaan Janssen
024a57e098 Merge branch 'v12/dev' into v13/dev
# Conflicts:
#	global.json
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html
#	src/Umbraco.Core/EmbeddedResources/Lang/da.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
#	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/RecurringBackgroundJobHostedServiceRunner.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
#	src/Umbraco.Web.UI/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs

(cherry picked from commit ef3f2c48198d8baed9d3340f926cd07e80720428)
2023-12-06 12:47:51 +01:00
Kenn Jacobsen
370e1cc125 Media Picker 3 should not be used as a macro parameter (#15330) 2023-12-06 10:18:23 +01:00
Ronald Barendse
8fefca557f Improve Central Package Management, update dependencies and fix package validation/MSBuild warnings (#15362)
* Use version overrides for ImageSharp 2

* Move Directory.Packages.props to root, use GlobalPackageReference and replace Microsoft.CSharp with Microsoft.CodeAnalysis.CSharp

* Replace NPoco.SqlServer with NPoco and remove unused System dependencies

* Fix package validation and MSBuild warnings

* Add nuget.config and enable package source mapping

* Remove explicitly set C# language version

* Add empty Directory.Packages.props file for acceptance test

* Downgrade SixLabors.ImageSharp back to 3.0.2 because of breaking changes

* Update ImageSharp/ImageSharp.Web to 3.1.0 and use ComputeHMAC
2023-12-06 08:19:46 +01:00
Sebastiaan Janssen
319d98ef23 Merge branch 'v12/dev' into contrib 2023-12-05 12:36:34 +01:00
kjac
55c901e2d7 Merge branch 'v13/dev' into release/13.0 2023-12-03 14:54:11 +01:00
Matthew Wise
eaf07d2189 Added logging around adding a property value during examine indexing 2023-11-30 19:16:58 +01:00
Brett Smith
ecc31a308a Added BlockEditorDataConverter method to BlockListPropertyEditorBase … (#14960) 2023-11-30 17:21:09 +01:00
Erik-Jan Westendorp
c0e0e7bad8 Add HealthCheckCompletedNotification (#15276) 2023-11-30 15:53:05 +01:00
Kenn Jacobsen
016709eecd Add query string info to links in API output (#15327) 2023-11-30 10:36:53 +01:00
Kenn Jacobsen
b596900246 Log meaningful job names and use template based log messages (#15307)
* Log meaningful job names and use template based log messages

* Review changes
2023-11-29 15:35:43 +01:00
Nikolaj Geisle
a8dc058cb5 V13: Delivery API composite id handler (#15305)
* Implement DeliveryApiCompositeIdHandler

* Replace duplicate decomposing with Handler instead

* Add obsolete messages

* Make Id integer instead of string

* Move from examine to core

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-11-29 14:10:25 +01:00
Kenn Jacobsen
88f907912b Cache block item constructors for block based editors (#15264)
* Cache block item constructors for block based editors

* Fix unit tests

* Fixed Grid unit tests

* Clear constructor caches when content types and data types change (to support InMemoryAuto models)
2023-11-29 12:27:07 +01:00
Bjarke Berg
1f527fefd8 Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.Integration/CompatibilitySuppressions.xml
2023-11-28 11:20:02 +01:00
Bjarke Berg
280518c9d6 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
#	src/Umbraco.Web.UI.Client/.nvmrc
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
2023-11-28 09:39:31 +01:00
Sven Geusens
c73b7f42d9 Move localdb file management of PublishedSnapshotService into itself. (#15085)
* Move localdb file management of PublishedSnapshotService into itself.

Added a way for the PublishedSnapshot service to clean up it's local files so (for example) Upgrade migrations have a reliable way of removing known invalid cache files without running into locking issues

* Small rename to differentiate existing method from simple getter

* Fix breaking change

Long live default implementations 🎉

* Another breaking change fix

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-11-28 09:31:11 +01:00