Bjarke Berg
b2a62c83bb
Update port
2021-03-22 10:14:45 +01:00
Bjarke Berg
d55a484c56
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/IO/SystemDirectories.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Services/IIconService.cs
# src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
# src/Umbraco.Tests/Scoping/ScopeTests.cs
# src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
# src/Umbraco.Web/Editors/PreviewController.cs
2021-03-19 16:18:32 +01:00
Bjarke Berg
48eff10696
Merge pull request #9990 from umbraco/netcore/feature/in-memory-runtime-minifier
...
Ability to have an in-memory runtime minifier cache and configurable cache busters
2021-03-18 11:36:28 +01:00
Shannon Deminick
8c66470d65
Merge pull request #9902 from emmagarland/netcore/members-passwordchange-temp
...
Update to enable members to use the same password change as users
2021-03-18 17:40:19 +11:00
Shannon
36f911b66f
Ensure IsApproved is persisted with MembersUserStore, Update member done in a trans and in specific steps, calls to SetLockoutEndDateAsync more safely with time before now.
2021-03-18 15:57:53 +11:00
Shannon Deminick
cb3ea50a37
Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier
2021-03-17 18:00:26 +11:00
Shannon
a3b4bb7bd9
oops didn't mean to commit that
2021-03-17 17:56:40 +11:00
Shannon
1a2d8623e6
oops didn't mean to commit that
2021-03-17 17:55:45 +11:00
Shannon
eba659b9ee
Gets in-memory runtime minifiy cache working, ensures no files can be accessed at the root, adds config to enable in-memory and configure a cache buster including a timestamp cache buster.
2021-03-17 17:44:52 +11:00
Bjarke Berg
1a573fcb75
Review fixes https://github.com/umbraco/Umbraco-CMS/pull/9968
2021-03-16 10:44:55 +01:00
Shannon
2d14d0bd4a
oops didn't mean to commit that
2021-03-16 19:20:29 +11:00
Shannon
ecbd6d1c81
Adds better support for app_plugins loading assets in a safer way and without having to pass refs
2021-03-16 19:19:03 +11:00
Bjarke Berg
836f4a9203
Merge branch 'netcore/dev' into netcore/feature/9623-external-login-token-store
2021-03-16 09:15:53 +01:00
Bjarke Berg
a356584eb6
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store
...
# Conflicts:
# src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
2021-03-16 09:14:05 +01:00
Bjarke Berg
55de69b647
Merge pull request #9961 from umbraco/netcore/feature/appsettings-local
...
Allow for having appsettings.local.json
2021-03-16 09:12:13 +01:00
Bjarke Berg
375609bc6e
Update src/Umbraco.Web.UI.NetCore/appsettings.json
2021-03-16 08:05:33 +01:00
Shannon
670bea81d1
Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier
...
# Conflicts:
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-16 17:49:05 +11:00
Shannon
e993410d2c
Merge branch 'netcore/bug/minify-plugins' of https://github.com/kjac/Umbraco-CMS into kjac-netcore/bug/minify-plugins
...
# Conflicts:
# src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
2021-03-16 17:22:25 +11:00
Bjarke Berg
b94cc517fc
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/9623-external-login-token-store
...
# Conflicts:
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
2021-03-12 13:04:46 +01:00
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
Shannon
e4807c2430
New table and service to store auth tokens
...
Implements the auth token retrieval and storage for the identity implementation. This is now automatically done for providers and the back office user manager can be used to retreive and store all tokens.
Fixes locking on the config writer.
Removes the abstract NodeObjectTypeId from the base repo since it shouldn't be there.
2021-03-11 19:35:43 +11:00
Shannon Deminick
e6f73b26ce
Update src/Umbraco.Web.UI.NetCore/appsettings.json
2021-03-11 14:09:23 +11:00
Elitsa Marinovska
63d7d23cd7
Revert changes to default appsettings.json
2021-03-10 14:42:31 +01:00
Bjarke Berg
8bc637090e
Error handling issue fix
...
Add the option to configure some pipeline that executes before Umbraco in the StartupFilter. AB10786
2021-03-10 12:50:27 +01:00
Shannon
52812672fc
Allow for having appsettings.Local.json
...
this file is not checked in and can be used to overwrite any custom settings that are in the repo without worrying about accidentally checking in developer settings as you work.
2021-03-10 15:22:45 +11: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
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
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
Bjarke Berg
c3d6cc0dcd
Revert test view component
2021-03-03 07:09:49 +01:00
Bjarke Berg
1c50ece986
Use c#9 + namespace fix
2021-03-02 16:20:44 +01:00
Shannon
3113efd122
Adds common.views to view imports
2021-02-26 14:11:00 +11:00
Shannon
b21db82929
missed change for default namespace in the UI project
2021-02-26 14:08:57 +11: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
c35af99030
Reverted appsettings
2021-02-22 20:57:41 +00: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
890cd45677
Fix namespace
2021-02-22 10:09:20 +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
Kenn Jacobsen
da0b869229
Merged with netcore/dev
2021-02-18 14:21:57 +01:00
Kenn Jacobsen
f5f6824629
Allow serving App_Plugins files to Smidge for minification
2021-02-18 14:07:24 +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
Elitsa Marinovska
a2cfd277ce
Cleanup
2021-02-18 08:33:49 +01:00
Mole
ce5eaac5a4
Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces
...
# Conflicts:
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
2021-02-17 15:44:36 +01:00
Mole
738150f5ad
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces
...
# Conflicts:
# src/Umbraco.Core/IO/ViewHelper.cs
# src/Umbraco.Core/Models/ContentModel.cs
# src/Umbraco.Core/Models/ContentModelOfTContent.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
# src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs
# src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs
# src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs
# src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs
# src/Umbraco.Web.Common/Controllers/RenderController.cs
# src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
# src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
# src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
# src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
# src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
# src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
# src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
2021-02-17 15:35:44 +01:00
Bjarke Berg
88acb07873
Merge pull request #9821 from umbraco/netcore/task/9716-custom-routes
...
Custom controller routes within an Umbraco context (i.e. virtual nodes)
2021-02-17 12:29:20 +01:00
Bjarke Berg
2ba3eb436c
Fixed up small findings in refiew..
...
- Uses ILogger<T> instead of ILoggerFactory
- Uses the GetControllerName extension
- Fixes views
2021-02-17 12:00:57 +01:00
Bjarke Berg
02ac81d53f
Fixed buildscripts to work with latest Umbraco.Build (0.2.17) and Directory.Build.props. Also updates the port (Now located in launchSettings.json) number if SetUmbracoVersion is called.
2021-02-16 12:28:37 +01:00
Mole
7213080b4e
Merge branch 'netcore/feature/align-namespaces' into netcore/feature/align-infrastructure-namespaces
2021-02-15 15:48:09 +01:00
Mole
7e8c7fdc2b
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces
...
# Conflicts:
# src/Umbraco.Infrastructure/Search/ExamineComposer.cs
2021-02-15 15:45:03 +01:00
