Bjarke Berg
|
b19dab5f3a
|
Fix merge issues
|
2022-04-20 15:42:27 +02:00 |
|
Bjarke Berg
|
23a49161d6
|
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
# Conflicts:
# build/build.ps1
# build/templates/UmbracoPackage/.template.config/template.json
# build/templates/UmbracoProject/.template.config/dotnetcli.host.json
# build/templates/UmbracoProject/.template.config/ide.host.json
# build/templates/UmbracoProject/.template.config/template.json
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
# src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
# src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
# umbraco-netcore-only.sln
|
2022-04-20 11:09:28 +02:00 |
|
Sebastiaan Janssen
|
48dbe959f6
|
Merge pull request #12249 from umbraco/v9/feature/merge-v9-contrib
|
2022-04-14 11:44:24 +02:00 |
|
Sebastiaan Janssen
|
4e71d6f2f6
|
Merge branch 'v9/dev' into v9/contrib
# Conflicts:
# src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
|
2022-04-12 13:41:34 +02:00 |
|
Ronald Barendse
|
c0b0a47612
|
Merge branch 'v9/dev' into v9/feature/projecttemplate-cleanup
|
2022-04-12 11:16:16 +02:00 |
|
Ronald Barendse
|
20666218d2
|
Move templates to root
|
2022-04-12 11:00:59 +02:00 |
|
Ronald Barendse
|
9187186c62
|
Generate lowercase telemetry ID
|
2022-02-24 10:21:15 +01:00 |
|
Ronald Barendse
|
5813a8aadf
|
Clean up and improve project templates
|
2022-02-23 23:20:13 +01:00 |
|
Ronald Barendse
|
4c037774de
|
Move templates to root
|
2022-02-23 22:45:35 +01:00 |
|