Commit Graph

675 Commits

Author SHA1 Message Date
Shannon
bd08adf2c7 Merge branch 'netcore/dev' of https://github.com/umbraco/Umbraco-CMS into netcore/dev 2021-03-16 17:23:55 +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
604cf69275 Merge pull request #9974 from umbraco/netcore/feature/migrate-cache-refresher-events-to-event-aggregator-pattern
Netcore: Migrate cache refresher events to IEventAggregator pattern
2021-03-16 06:44:26 +01:00
Bjarke Berg
b82ea437b7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/remove-backofficeusermanager-static-events 2021-03-15 14:35:46 +01:00
Bjarke Berg
0374f6c2f5 Update src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
Co-authored-by: Shannon Deminick <sdeminick@gmail.com>
2021-03-15 06:32:40 +01:00
Shannon Deminick
ada5599a83 Merge pull request #9839 from kjac/netcore/feature/minify-js-resources
Do not apply runtime optimization to core scripts and script libraries
2021-03-15 15:08:35 +11:00
Shannon
4071df322a Adds missing null check on tagHelperOutput.TagName which can be null 2021-03-15 13:40:00 +11:00
Bjarke Berg
06a202e30e Migrated CacheRefresher events to IEventAggregator pattern. 2021-03-12 21:49:42 +01:00
Bjarke Berg
fca6fb2a44 Merge pull request #9970 from umbraco/netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions
Netcore: Reintroduce friendly bun untestable published content extensions
2021-03-12 13:02:41 +01:00
Bjarke Berg
9a180c1685 Update src/Umbraco.Web.Common/DependencyInjection/StaticServiceProvider.cs
Co-authored-by: Andy Butland <abutland73@gmail.com>
2021-03-12 11:48:23 +01:00
Bjarke Berg
aa34f32990 bugfix 2021-03-12 11:38:28 +01:00
Bjarke Berg
b71e469854 Added missing extensions 2021-03-12 11:25:58 +01:00
Bjarke Berg
1b5eb1ec20 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/reintroduce-friendly-bun-untestable-published-content-extensions 2021-03-11 11:35:48 +01:00
Bjarke Berg
c9bd3ed653 Change namespace 2021-03-11 11:35:41 +01:00
Bjarke Berg
8d743cbe2c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 10:33:48 +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
Bjarke Berg
78d8f0bacf Fix Deserialization of defaultConfig from package.manifest 2021-03-10 21:13:13 +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
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
Shannon
a668e9aa07 Fixup package refs and nuspecs, remove IDisposeOnRequestEnd 2021-03-09 13:12:52 +11:00
Shannon
6dd5714923 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
# Conflicts:
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
2021-03-09 12:52:15 +11:00
Shannon Deminick
e8cc0fcac5 Update src/Umbraco.Web.Common/Cache/HttpContextRequestAppCache.cs
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-03-09 12:47:13 +11:00
Shannon
78f5b2f0d7 removes double httpcontextaccessor registration and updates test notes. 2021-03-09 12:45:51 +11:00
Bjarke Berg
6d293c6ffd Fixed null ref exception 2021-03-08 21:37:31 +01:00
Bjarke Berg
49bb5ee4b7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/AB10710_UmbracoContext_should_not_use_IBackOfficeSecurity 2021-03-08 21:27:40 +01:00
Bjarke Berg
72411aa1a1 Add nice error page for boot, like in v8 2021-03-08 10:03:36 +01:00
Shannon
a07728f8db Starts removing usage of CallContext and some cleanup 2021-03-08 17:08:15 +11: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
Bjarke Berg
24d4b4c9fb Added validation and moved Unattended Settings into their own model. + Added DataAnnonation validation on all our settings 2021-03-07 19:20:16 +01: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
820be3c063 Remove the extra whitespace I added 2021-03-05 17:18:32 +00:00
Warren Buckley
254d88e3c8 Update src/Umbraco.Web.Common/Install/CreateUnattendedUserNotificationHandler.cs 2021-03-05 17:16:05 +00:00
Warren Buckley
e11079c568 Update src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs 2021-03-05 17:15:59 +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
Mole
d505c85551 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-05 14:07:16 +01:00
Mole
f5df05d685 Add metadata to all packages and rename UmbracoCms.Lucene.nuspec to UmbracoCms.Examine.Lucene.nuspec 2021-03-05 13:56:41 +01:00
Shannon
df333ec8cb Updates scopes in execution context to use a Stack so we know which is the top Scope/Context. Fixes disposing things on end request, fixes ensuring orphaned scopes are disposed at end request. 2021-03-05 15:27:45 +11:00
Mole
390cf6ca66 Pack all projects as individual packages and add them as dependency
Only have to add Umbraco.Cms.Web.Website and Umbraco.Cms.Web.BackOffice, rest will be indirect dependencies.
2021-03-04 14:10:55 +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
1ef60a7c7d removes unneeded ctor dependency on UmbracoContext 2021-03-04 16:44:09 +11:00
Shannon
df9da835b3 fixing tests 2021-03-04 16:04:45 +11:00
Shannon
d986311459 removes commented out code 2021-03-04 15:38:22 +11:00
Shannon
efb84409f5 kill UmbracoWebsiteSecurityFactory and UmbracoRoutedRequest, simplify all this. 2021-03-04 15:12:58 +11:00
Shannon
ed5116664f kill IBackOfficeSecurityFactory and fix the broken dependency chain 2021-03-04 15:07:54 +11:00
Shannon
089d147917 Fix namespaces 2021-03-04 14:49:19 +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
008fd4271c Fix unattented admin install 2021-03-03 19:48:01 +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
Warren Buckley
b0f078fa4b Trying to get the event/notification handler setup & happy :S 2021-03-03 16:04:28 +00:00