Bjarke Berg
|
6e89e9a8a9
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies
# Conflicts:
# src/Umbraco.Infrastructure/ModelsBuilder/ApiVersion.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/ModelsGenerator.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/PropertyModel.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/TextHeaderWriter.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModel.cs
# src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModelHasher.cs
# src/Umbraco.Infrastructure/ModelsBuilder/LiveModelsProvider.cs
# src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
# src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
# src/Umbraco.Infrastructure/ModelsBuilder/ModelsGenerationError.cs
# src/Umbraco.Infrastructure/ModelsBuilder/OutOfDateModelsStatus.cs
# src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
# src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
# src/Umbraco.Infrastructure/ModelsBuilder/RoslynCompiler.cs
# src/Umbraco.Infrastructure/ModelsBuilder/TypeExtensions.cs
# src/Umbraco.Infrastructure/ModelsBuilder/UmbracoServices.cs
# src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
# src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
# src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
# src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
# src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
# src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
# src/Umbraco.Web.Common/ModelsBuilder/RefreshingRazorViewEngine.cs
# src/Umbraco.Web.Common/ModelsBuilder/UmbracoAssemblyLoadContext.cs
# src/Umbraco.Web.UI.NetCore/Startup.cs
# src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
|
2021-02-22 09:00:33 +01:00 |
|
Shannon
|
1400a02798
|
Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller
# Conflicts:
# src/Umbraco.Core/Constants-Security.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
# src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
# src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
# src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
|
2020-10-23 10:10:02 +11:00 |
|
Bjarke Berg
|
586c61f282
|
moved getting-started.json from old to new project
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-10-05 07:50:55 +02:00 |
|
Bjarke Berg
|
9524aefb90
|
Delete getting-started.json from new project
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-10-05 07:49:51 +02:00 |
|
Elitsa Marinovska
|
8f5678b226
|
Fixes contents of getting-started.json, some misalignments happened when merging v8/dev
|
2020-09-29 17:11:27 +02:00 |
|
Bjarke Berg
|
7d3bc9be1c
|
Moved serilog config to appsettings and configured it to also catch MS logging messages.
Added Console log for Development
|
2020-09-17 09:01:10 +02:00 |
|
Bjarke Berg
|
c0d4516e15
|
Updated default config files
|
2020-08-24 14:15:53 +02:00 |
|
Bjarke Berg
|
c49f50e6d4
|
Clean up
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-07-04 19:04:04 +02:00 |
|
Bjarke Berg
|
1dc0dc497d
|
added files that are renamed with casing only
|
2020-07-04 17:39:44 +02:00 |
|