Commit Graph

44250 Commits

Author SHA1 Message Date
Sebastiaan Janssen
75ec1f82ac Merge branch 'contrib' of https://github.com/umbraco/Umbraco-CMS into contrib 2023-12-08 12:42:39 +01:00
Sebastiaan Janssen
67c8f098a0 Add login screen to the readme 2023-12-08 12:42:29 +01:00
Zeegaan
f65e76ba5a Bump version 2023-12-08 09:04:51 +01:00
Bjarne Fyrstenborg
87b8023f2c Fix typo in dictionary (#15380) 2023-12-07 17:51:28 +00:00
Nikolaj Geisle
4b5bbbd531 Change webhook-> logs to Deliveries 2023-12-07 15:23:21 +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
d31bb14f57 Link to log on exception/error (#15391) 2023-12-07 12:11:38 +01:00
Nikolaj Geisle
0534c5f776 Log retrycount and properly log request headers (#15390) 2023-12-07 12:10:19 +01:00
Bjarke Berg
1a93dae0c4 Ensure the toggles return booleans and not integers. (#15354) 2023-12-07 11:25:31 +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
Bjarke Berg
cb76554455 Bugfix: Count existing media correct (#15206)
* https://github.com/umbraco/Umbraco-CMS/issues/15205
Count media correct

* Fix content should be document

(cherry picked from commit d2ff2ea46e)
2023-12-07 09:21:25 +01:00
Bjarne Fyrstenborg
b97564ba3a Fix console errors in content type editor with single block mode 2023-12-06 14:15:15 +01:00
dependabot[bot]
4bea40dfb4 Bump vite from 4.5.0 to 4.5.1 in /src/Umbraco.Web.UI.Login
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.1/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.1/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-06 14:05:39 +01:00
Sebastiaan Janssen
5a159a756d Merge branch 'v13/dev' into contrib
# 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/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs
2023-12-06 13:06:30 +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
Bjarke Berg
312276bde7 Bump version 2023-12-06 10:21:46 +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
Sebastiaan Janssen
a31d4746b3 Merge branch 'contrib' into v12/dev 2023-12-06 10:00:22 +01:00
Bjarke Berg
9a54b5ed6e Merge remote-tracking branch 'origin/release/13.0' into v13/dev 2023-12-06 08:28:44 +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
Richard Ockerby
17eda54bfb Don't overwrite default values in the block list editor if they don't exist in the data model (for new creations) 2023-12-05 21:22:45 +01:00
Sebastiaan Janssen
a6b53b0a93 Fixing PR #15318 which updated an interface, which is breaking (#15363) 2023-12-05 16:49:55 +01:00
Jacob Overgaard
25e36871d7 use dotnet 8 2023-12-05 13:15:03 +01:00
Jacob Overgaard
0a048d9231 Update nightly build (#15359)
* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
2023-12-05 13:01:19 +01:00
Jacob Overgaard
d3f0506f0b Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-05 12:58:36 +01:00
Jacob Overgaard
051dfd1fff Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-12-05 12:57:47 +01:00
Jacob Overgaard
37e4d80ce8 Update nightly build (#15359)
* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
2023-12-05 12:45:23 +01:00
Sebastiaan Janssen
14a64857df Merge branch 'contrib' of https://github.com/umbraco/Umbraco-CMS into contrib 2023-12-05 12:41:21 +01:00
Jacob Overgaard
79af9e8e2b Update nightly build (#15359)
* cherry-pick templateParameters from v14/dev

* add isNightly parameter

* remove v9

* add parameter check for myget isNightly
2023-12-05 12:38:14 +01:00
Sebastiaan Janssen
319d98ef23 Merge branch 'v12/dev' into contrib 2023-12-05 12:36:34 +01:00
Kenn Jacobsen
e7279d2ff0 Add range filter options to the Delivery API (#15353)
* Add range filter options to the Delivery API

* Add range filter examples to Swagger docs
2023-12-05 11:01:25 +01:00
Ronald Barendse
c598171d85 Change WebhookEventCollectionBuilder to set collection (#15351)
* Change WebhookEventCollectionBuilder to set collection

* Fix AddHealthCheck extension method
2023-12-05 10:33:47 +01:00
Ronald Barendse
12a43c2406 v13: Update deploy types (add setter to ArtifactDependency.Checksum and TryGetValue()/GetEntityTypes() to IFileTypeCollection) (#15318) 2023-12-04 16:00:54 +01:00
Erik-Jan Westendorp
d5c137583d AddDynamicRootStep 2023-12-04 15:00:03 +01:00
Sebastiaan Janssen
941705b03d Revert "Grant all users access to the content recycle bin (#14977)"
This reverts commit ed006931a4.
2023-12-04 14:34:47 +01:00
Ronald Barendse
8a65c00279 Fix health check webhook event registration 2023-12-04 14:11:42 +01:00
Erik-Jan Westendorp
80dcc04df0 Add HealthCheckCompletedWebhookEvent (#15337) 2023-12-04 14:04:57 +01:00
Ronald Barendse
c20d96c705 Use fluent API for adding webhook events and add document type events (#15345)
* Move adding webhooks to extension methods

* Clean up WebhookEventCollectionBuilder

* Rename AddAllAvailableWebhooks to AddCmsWebhooks and internalize defaults

* Use fluent CmsWebhookEventCollectionBuilder for adding CMS specific webhook events

* Split media and media type webhook events

* Use fluent CmsUserWebhookEventCollectionBuilder for adding CMS user specific webhook events

* Rename extension methods and add onlyDefault parameter

* Remove duplicate UserForgotPasswordRequestedWebhookEvent

* Add document type webhook events and use fluent builders for content and content types

* Use fluent WebhookEventCollectionBuilderCmsMember for adding member/member group webhook events

* Use fluent WebhookEventCollectionBuilderCmsTemplate for template/partial view webhook events

* Use fluent WebhookEventCollectionBuilderCmsFile for file based webhook events (instead of only template/partial view)

* Move all webhook events to Umbraco.Cms.Core.Webhooks.Events namespace

* Reorder AddFile method and update documentation
2023-12-04 13:25:51 +01:00
Ronald Barendse
da56f16abf Move helper methods for adding webhooks to extension methods (#15344)
* Move adding webhooks to extension methods

* Clean up WebhookEventCollectionBuilder

* Rename AddAllAvailableWebhooks to AddCmsWebhooks and internalize defaults
2023-12-04 10:58:11 +01:00
Andreas Zerbst
2a56d4e376 V12 Integration test for InternalIndex and ExternalIndex Search (#15167)
* Added the possibility for us to search through the external index

* Added ForceInstantExecution

* Added InternalIndex integration tests

* Added External Index integration tests

* Removed comments

* Remove unused internal field

* Add mechanism to wait for index rebuilding

* Remove some of the usages of sleep

* Remove sleeps

* Added comments from review

* Added a method for getting the IndexPath

---------

Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
2023-12-04 10:00:26 +01:00
kjac
55c901e2d7 Merge branch 'v13/dev' into release/13.0 2023-12-03 14:54:11 +01:00
Bjarne Fyrstenborg
c6d01178c0 Update z-index of block actions (#15329) 2023-12-01 13:51:42 +00:00
Vitor Rodrigues
a4b4107190 Expose the Delivery API CLR type (#15150)
* Expose the Delivery API CLR type

* Updated field naming and warnings

Addresses PR feedback

* Added default implementation to prevent breaking change

(cherry picked from commit 7f4378066d)
2023-12-01 13:50:18 +01:00
Vitor Rodrigues
7f4378066d Expose the Delivery API CLR type (#15150)
* Expose the Delivery API CLR type

* Updated field naming and warnings

Addresses PR feedback

* Added default implementation to prevent breaking change
2023-12-01 13:43:39 +01:00
Vitor Rodrigues
d315a1082e Fixed potential NuCache file lock causing unusable website (#14940)
* Fixed potential NuCache file lock causing unusable website

* Remove unnecessary volatile read
2023-12-01 13:05:50 +01:00
Ronald Barendse
50baed151d Use version range on project references (#14719) 2023-12-01 11:12:18 +01:00
Jacob Overgaard
8f497c8f7e V13 RC: Fix regression for external login providers (#15334)
* add check for the presence of the ?logout=true parameter on the login screen to avoid autoredirect to external login

* refactor controller to eliminate need for duplicate defaultResponse and externalLoginResponse (they are always the same)

* refactor to reduce nesting
2023-12-01 10:32:54 +01:00
Bjarne Fyrstenborg
da6aaa07db Don't change format in convertToLocalMomentTime (#15223)
(cherry picked from commit 963e57723a)
2023-12-01 10:03:23 +01:00
Bjarke Berg
d5d4edbe92 Bump Version 2023-11-30 21:51:54 +01:00