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
a86054e487
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/merge-v8-05032021
2021-03-08 07:01:19 +01:00
Warren Buckley
86fff278c6
Update src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-05 17:15:53 +00: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
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
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
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
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
Kenn Jacobsen
6c7316afcd
Move preview authorization middleware to fix preview
2021-02-19 11:45:58 +01:00
Mole
bf41c2eeaa
Netcore: Align namespaces ( #9801 )
...
* Rename Umbraco.Core namespace to Umbraco.Cms.Core
* Move extension methods in core project to Umbraco.Extensions
* Move extension methods in core project to Umbraco.Extensions
* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine
* Move examine extensions to Umbraco.Extensions namespace
* Reflect changed namespaces in Builder and fix unit tests
* Adjust namespace in Umbraco.ModelsBuilder.Embedded
* Adjust namespace in Umbraco.Persistence.SqlCe
* Adjust namespace in Umbraco.PublishedCache.NuCache
* Align namespaces in Umbraco.Web.BackOffice
* Align namespaces in Umbraco.Web.Common
* Ensure that SqlCeSupport is still enabled after changing the namespace
* Align namespaces in Umbraco.Web.Website
* Align namespaces in Umbraco.Web.UI.NetCore
* Align namespaces in Umbraco.Tests.Common
* Align namespaces in Umbraco.Tests.UnitTests
* Align namespaces in Umbraco.Tests.Integration
* Fix errors caused by changed namespaces
* Fix integration tests
* Undo the Umbraco.Examine.Lucene namespace change
This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.
* Fix merge
* Fix Merge
2021-02-18 11:06:02 +01:00
Mole
7f58b3479b
Align namespaces in WebAssets to Umbraco.Cms.Infrastructure
2021-02-15 13:07:12 +01:00
Mole
30b086d5d0
Align namespaces in Security to Umbraco.Cms.Core
2021-02-15 12:01:12 +01:00
Emma Garland
167811b23b
Moving adding members services to correct project for use on the front-end, not just the back-office.
2021-02-14 12:57:48 +00:00
Emma Garland
2d00ece365
Renamed MembersUserManager
2021-02-12 14:38:20 +00:00
Mole
b74abaf3af
Align namespaces in DependencyInjection to Umbraco.Cms.Infrastructure.DependencyInjection
...
Even though Core also has this, then pretty much every project has their own DI namespace, and this one does reference third party dependencies as far as I can see
2021-02-12 10:41:07 +01:00
Mole
55aa2edb72
Align namespaces in Umbraco.Web.Common
2021-02-10 11:42:04 +01:00
Mole
428e80f515
Align namespaces in Umbraco.Web.BackOffice
2021-02-10 11:11:18 +01:00
Emma Garland
5d51427858
PR Review: Renamed to Noop for consistency
2021-02-09 13:45:08 +00:00
Mole
216fb87c79
Rename Umbraco.Core namespace to Umbraco.Cms.Core
2021-02-09 10:22:42 +01:00
Emma Garland
7df0040127
Merge branch 'netcore/netcore' into netcore/members-userstore
2021-01-25 10:07:53 +00:00
Shannon
0ce34bea18
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/models-builder-9789
...
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
2021-01-19 17:43:18 +11:00
Emma Garland
1431a0a076
Merge branch 'netcore/netcore' into netcore/members-userstore
...
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
# src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
2021-01-15 16:51:23 +00:00
Shannon
029ef31e01
Removing MB composers to ext methods
2021-01-13 12:48:41 +11:00
Bjarke Berg
cbe2214afc
AB#9725 - Removed IUmbracoApplicationLifetimeManager.cs and IUmbracoApplicationLifetime.ApplicationInit
...
Migrated some of the components to UmbracoBuilder and fixed issues with the way asp.net core need to append the profiler html
2021-01-12 13:58:48 +01:00
Emma Garland
d285f626a0
Pull request peer review changes - renamed password method, removed unneeded non-strongly typed Member GetAllRoles() method, removed duplicate Normalizer test and rename normalizer, removed currently unneeded events on MembersUserManager. Fixed namespaces and ensured tests in correct location.
2021-01-11 14:24:49 +00:00
Emma Garland
ba317b24dc
Merge branch 'netcore/netcore' into netcore/members-userstore
...
# Conflicts:
# src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
# src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
# src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
# src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
2021-01-04 17:04:05 +00:00
Shannon
34427b0104
Moves AddDistributed cache back to being called implicitly, ensures notification handlers are not added twice
2021-01-04 13:22:29 +11:00
Shannon
d46545faa0
For now, we explicitly require AddDistributedCache in Startup so it's not called twice.
2021-01-04 13:01:49 +11:00
Shannon
999c20a755
Fixes UmbracoIntegrationTest Mapping flag and missing using in Startup
2021-01-04 12:22:03 +11:00
Shannon
1a0d961e42
removes WebsiteComposer, BackOfficeComposer
2020-12-24 18:11:16 +11:00
Shannon
e785ac28a3
Moves more services and registrations "up", removes AspNetCoreComposer logic and moves to AddWebComponents
2020-12-24 14:29:26 +11:00
Shannon
d5a19530f3
Fixing tests, more DependencyInjection namespace
2020-12-23 13:06:22 +11:00
Shannon
696dd0b8dc
removes partial keyword
2020-12-23 12:11:38 +11:00
Shannon
7115e0a11e
shuffles code with DependencyInjection namespace, forgot to commit changes to Startup
2020-12-23 12:02:01 +11:00