Bjarke Berg
2b89839724
Netcore: Get rid of default files in config folder ( #9966 )
...
* TourController now uses the core tours from embedded resources
* Moved tinyMceConfig.*.config to IOptions
* Embedded the default grid.editors.config.js
* Fixed issue when saving grid with an empty media cell
* Logviewer now uses sql as database instead of file.
* Remove config folder from build script and nuget pacakges.
* Removing auto-generated Id added to appsettings.json
* Update src/Umbraco.Web.BackOffice/Controllers/TourController.cs
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk >
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com >
2021-03-11 13:20:46 +01:00
Bjarke Berg
91e877cebe
Merge pull request #9849 from kjac/netcore/bug/preview
...
Preview does display draft versions
2021-03-11 08:41:21 +01:00
Elitsa Marinovska
1e480abfc8
Remove duplicated TreeAccessDocumentTypes policy and fixed the one for TreeAccessDictionary
2021-03-10 14:40:25 +01:00
Bjarke Berg
bec0e09aed
Update src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeSecurityStampValidatorOptions.cs
2021-03-10 07:26:46 +01:00
Shannon
87749b5078
Ensures claims continue to flow even after the security stamp validator executes.
2021-03-10 14:46:51 +11:00
Bjarke Berg
1aa8d3aa09
Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-05032021
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
2021-03-09 10:08:53 +01:00
Bjarke Berg
d81874aee3
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021
...
# Conflicts:
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
2021-03-09 09:31:55 +01:00
Bjarke Berg
a86054e487
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021
2021-03-08 07:01:19 +01:00
Shannon
8c88c3e00f
Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
...
# Conflicts:
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-08 13:33:07 +11:00
Warren Buckley
c57a9b9d3b
Merge remote-tracking branch 'origin/netcore/dev' into netcore/unattended-user-create
2021-03-05 17:25:57 +00:00
Warren Buckley
86fff278c6
Update src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-05 17:15:53 +00:00
Bjarke Berg
ec1d3dd43d
Revert test values
2021-03-05 15:47:33 +01:00
Bjarke Berg
37ed84871a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/CacheKeys.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/Extensions/UriExtensions.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Media/Exif/MathEx.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/Membership/User.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
# src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
# src/Umbraco.Core/Routing/AliasUrlProvider.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UriUtility.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/RuntimeOptions.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Security/BackOfficeUserStore.cs
# src/Umbraco.Core/Security/ContentPermissions.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Trees/TreeNode.cs
# src/Umbraco.Core/Udi.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
# src/Umbraco.Tests/Testing/TestDatabase.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
# src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
# src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TourController.cs
# src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# 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/config/umbracoSettings.Release.config
# src/Umbraco.Web/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/Logging/WebProfiler.cs
# src/Umbraco.Web/Logging/WebProfilerProvider.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/JsonNetResult.cs
# src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/RoutableDocumentFilter.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/DictionaryTreeController.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
# src/Umbraco.Web/Trees/LogViewerTreeController.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
# src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
# src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
2021-03-05 15:36:27 +01:00
Shannon
d72c11821f
Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
...
# Conflicts:
# src/Umbraco.Core/HybridAccessorBase.cs
# src/Umbraco.Core/Security/IBackOfficeSecurityFactory.cs
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs
2021-03-04 16:57:32 +11:00
Shannon Deminick
0daad54d7f
Merge pull request #9915 from umbraco/netcore/task/9726-fixing-macros
...
Fixing macro rendering with forms
2021-03-04 16:48:24 +11:00
Shannon
1163e7aa3b
Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
2021-03-04 14:49:56 +11:00
Shannon
2d0389d53c
Updates project dependencies to latest patch releases, removes Umbraco.Code from Umbraco.Web since it was causing conflicts for some reason - finally these conflict errors are gone.
2021-03-04 14:10:10 +11:00
Warren Buckley
aa9ff2e670
The event fires and hits the Handle in the notification/event handler
...
But it implodes when I inject/add UserManager to this
2021-03-03 16:31:17 +00:00
Shannon
dfc202a6c8
init code cleanup
2021-03-03 09:56:34 +11:00
Bjarke Berg
1c50ece986
Use c#9 + namespace fix
2021-03-02 16:20:44 +01:00
Bjarke Berg
4d5c7988cf
Merge pull request #9892 from kjac/netcore/feature/remove-editormodel-static-events
...
Replace static editor model events events with IEventAggregator notifications
2021-03-01 14:15:54 +01:00
Kenn Jacobsen
e407d083c2
Resolved merge conflicts with netcore/dev
2021-03-01 13:26:34 +01:00
Kenn Jacobsen
0bdd1cc874
Replaced if/else with switch
2021-03-01 13:17:24 +01:00
Bjarke Berg
a67f7fad6f
Merge pull request #9881 from kjac/netcore/feature/remove-treecontroller-static-events
...
Replace static events in TreeControllerBase with IEventAggregator notifications
2021-03-01 10:24:20 +01:00
berg
d7d99e5c00
Fixed issue found by cypress test. script/css folders was not deleted because it search in contentroot and not wwwroot
2021-02-27 19:26:36 +01:00
Kenn Jacobsen
3769e8108c
Remove static methods and events from EmailSender
2021-02-25 15:08:56 +01:00
Mole
0a2efc252f
Re introduce cookie check, but adding return statement
2021-02-24 13:20:53 +01:00
Mole
2fcae1cc28
Fix installing packages.
2021-02-24 12:54:30 +01:00
Kenn Jacobsen
0393a54abf
Postfixed notifications with "Notifications" for improved discoverability
2021-02-24 08:56:41 +01:00
Kenn Jacobsen
06c5ce5bb8
Replace static editor model events events with IEventAggregator notifications
2021-02-24 08:43:50 +01:00
Kenn Jacobsen
b1aabade55
Formatting and comments
2021-02-23 16:20:22 +01:00
Kenn Jacobsen
b05d71f76c
Replaced static events in TreeControllerBase with IEventAggregator notifications
2021-02-23 16:09:36 +01:00
Bjarke Berg
ef4e2eb511
Renamed service implementations namespace to Core
2021-02-23 12:24:51 +01:00
Bjarke Berg
dc4595b16a
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
# src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
2021-02-23 12:07:22 +01:00
Bjarke Berg
d641e375c5
Merge pull request #9833 from umbraco/9622-remove-backofficeidentity
...
Netcore: Remove UmbracoBackOfficeIdentity
2021-02-23 11:29:23 +01:00
Bjarke Berg
bbaba0c542
Add or update the TicketExpiresClaimType claim, to ensure its not added multiple times, now that is can be there after a clone.
2021-02-23 10:07:17 +01:00
Mole
36d6ab2213
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/Migrations/Expressions/Rename/Expressions/RenameColumnExpression.cs
# src/Umbraco.Infrastructure/Migrations/IMigrationExpression.cs
2021-02-23 09:06:31 +01:00
Bjarke Berg
73010dece5
Merge pull request #9852 from kjac/netcore/feature/umbraco-version-current-rename
...
Rename UmbracoVersion.Current to UmbracoVersion.Version
2021-02-23 08:53:19 +01:00
Mole
159747ab61
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
# src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComponent.cs
# src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Infrastructure/Security/IBackOfficeUserManager.cs
# src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
# src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
# src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
# src/Umbraco.Infrastructure/Security/UserInviteEventArgs.cs
# src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
# src/Umbraco.Web/Security/IBackOfficeUserPasswordChecker.cs
# src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
2021-02-23 08:51:09 +01:00
Mole
9d0493d38f
Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity
...
# Conflicts:
# src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
# src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
2021-02-23 08:29:03 +01:00
Emma Garland
2109bee83b
Merge branch 'netcore/dev' into netcore/members-userstore
...
# Conflicts:
# src/Umbraco.Core/Models/Membership/IMembershipUser.cs
# src/Umbraco.Core/Models/Membership/IUser.cs
# src/Umbraco.Core/Services/IMembershipRoleService.cs
# src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
# src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs
# src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
# src/Umbraco.Infrastructure/Security/IBackOfficeUserPasswordChecker.cs
# src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
# src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
# src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
# src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
# src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
# src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
# src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
# src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
# src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
# src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
# src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
# src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs
# src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs
# src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs
# src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
# src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs
# src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs
# src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/MembershipProviderBase.cs
# src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
# src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
2021-02-22 20:55:12 +00:00
Mole
8f21fb5492
Fix Merge
2021-02-22 15:46:46 +01:00
Mole
1c1394e0bf
Replace usages of ClaimsIdentityExtensions.Issuer with Constants.Security.BackOfficeAuthenticationType
...
Also remove todo and cases of using ClaimsIdentityExtensions = Umbraco.Extensions.ClaimsIdentityExtensions;
2021-02-22 15:31:25 +01:00
Mole
405d0e704d
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
# src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
# src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
2021-02-22 15:18:04 +01:00
Bjarke Berg
c453719c2d
Fix the register of the IModelsBuilderDashboardProvider
2021-02-22 09:49:24 +01:00
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
Mole
63c8365e6a
Fix merge and consolidate ClaimsIdentityExtensions into one file.
2021-02-22 08:51:37 +01:00
Mole
d413bf49f9
Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity
...
# Conflicts:
# src/Umbraco.Core/Security/AuthenticationExtensions.cs
# src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
# src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs
# src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
# src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs
# src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
# src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
2021-02-22 08:38:12 +01:00
Emma Garland
0fe7ad826d
Updated membership successful result as per PR comments
2021-02-19 17:03:48 +00:00
Kenn Jacobsen
764014fd63
Rename UmbracoVersion.Current to UmbracoVersion.Version
2021-02-19 14:26:55 +01:00
