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 |
|
Kenn Jacobsen
|
34d6695c89
|
Don't expect specific .NET feature versions - utilize rollForward instead. (#15304)
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
|
2023-11-28 13:21:09 +01:00 |
|
Kenn Jacobsen
|
0a852aeb07
|
Don't expect specific .NET feature versions - utilize rollForward instead. (#15303)
|
2023-11-28 13:02:52 +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 |
|
Ronald Barendse
|
28550b88c8
|
Remove implicitly set EmbedUntrackedSources property
|
2023-11-21 11:39:04 +01:00 |
|
Bjarke Berg
|
65b7967fed
|
Updated to .NET 8 final (#15204)
|
2023-11-15 09:29:50 +01:00 |
|
Bjarke Berg
|
60644fadc0
|
Update global.json
|
2023-11-14 13:27:50 +01:00 |
|
Bjarke Berg
|
162a6a0085
|
Post merge
|
2023-11-14 09:39:39 +01:00 |
|
Bjarke Berg
|
d6751e2832
|
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
# version.json
|
2023-11-13 18:30:50 +01:00 |
|
Ronald Barendse
|
ed65645a33
|
Add global.json and cleanup UI project file (#14900)
* Add global.json with minimum .NET 6.0.5 SDK version and roll forward policy
* Clean up UI project file
|
2023-11-09 13:52:21 +01:00 |
|