yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,742 Commits 4 Branches 7 Tags
52182ebbf586865a119c95eb9f382d0df1d2834e
Commit Graph

37742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
52182ebbf5 Fixes logging for PublishedRouter 2021-03-10 12:08:20 +11:00
Bjarke Berg
d5fb31b3a2 Reintroduce tests 2021-03-09 11:32:23 +01:00
Bjarke Berg
9153715432 Post merge fixes 2021-03-09 11:15:55 +01: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
5fee73f50d Merge pull request #9926 from umbraco/netcore/bugfix/10196-ambient-scope 
Fixes ExecutionContext flowing to child threads (Ambient Scope issues)
 2021-03-09 09:12:43 +01:00
Shannon
a40b754636 merge issue 2021-03-09 18:30:20 +11:00
Shannon
0b6d99c23a oops, forgot commit 2021-03-09 17:50:43 +11: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
32d75b16af Merge pull request #9916 from umbraco/netcore/bugfix/AB10710_UmbracoContext_should_not_use_IBackOfficeSecurity 
Netcore: Fix coupling between IBackOfficeSecurity and IUmbracoContext
 2021-03-09 12:49:53 +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
745014a4c3 User manager related updates (#9935) 
* Only allow not-admins to assign groups they have themselves

* Only admins is allowed to change password of other admins

* Fixed issue with deep clone of UserGroup. The Allowed sections was not cloned. This resulted in the allowed sections of the object stored in cache was updated, everytime we changed the allowed sections on an object cloned from the cache. Even if we did not save it.

* Only Admins are allowed to add sections to a user group, that they don't have access to themselves

* Align backend code with UI. User managers that is are not admin, can only assign the same groups new users, that they have themselves.

* Make existingGroupAliases and empty array when creating a new user

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-03-08 13:26:52 +01:00
Sebastiaan Janssen
4a8a73f03d Merge branch 'v8/8.12' into v8/dev 2021-03-08 12:28:55 +01:00
Sebastiaan Janssen
49435708a5 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 12:28:21 +01:00
Sebastiaan Janssen
8b04c32dff Merge branch 'v8/8.10' into v8/8.11 2021-03-08 12:27:42 +01:00
Lars-Erik Aabech
fc447bb101 Should allow grid editors to use hash based settings (#9837) 
* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785)
 2021-03-08 12:27:06 +01:00
Bjarke Berg
cf5d000d90 Raise UmbracoApplicationStarting after unattended upgrade 2021-03-08 10:19:17 +01:00
Sebastiaan Janssen
b59026ae5c Merge branch 'v8/8.12' into v8/dev 2021-03-08 10:08:36 +01:00
Sebastiaan Janssen
c36a2bced6 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 10:08:01 +01:00
Sebastiaan Janssen
0386a311d7 Merge branch 'v8/8.10' into v8/8.11 2021-03-08 10:07:40 +01:00
Sebastiaan Janssen
5825aa5dee Merge branch 'v8/8.9' into v8/8.10 2021-03-08 10:07:08 +01:00
Sebastiaan Janssen
ac41c5451e Merge branch 'v8/8.8' into v8/8.9 2021-03-08 10:06:37 +01:00
Niels Lyngsø
cef1a73a2e no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit af65810048)
 2021-03-08 10:05:46 +01:00
Bjarke Berg
72411aa1a1 Add nice error page for boot, like in v8 2021-03-08 10:03:36 +01:00
Niels Lyngsø
af65810048 no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-03-08 09:44:33 +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
29901f9ecf minor cleanup 2021-03-08 13:42:51 +11: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
Shannon
455181dbb4 Fixing tests 2021-03-08 12:31:17 +11:00
Bjarke Berg
e7176164b1 Merge pull request #9934 from umbraco/netcore/unattended-user-create 
Unattended Install - Automated User Creation
 2021-03-07 20:25:40 +01: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
Warren Buckley
86fff278c6 Update src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs 2021-03-05 17:15:53 +00:00
Warren Buckley
ea05685db6 Revert changes as not needed 2021-03-05 17:13:09 +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
1094ae3723 fix test 2021-03-05 15:37:34 +11:00
Shannon
283130e349 fix build 2021-03-05 15:35:20 +11: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
Shannon
7d45a585ee adds tests 2021-03-04 23:59:41 +11:00
Sebastiaan Janssen
475f7e6c3b Bump version to 8.12.0 2021-03-04 09:40:23 +01:00
Shannon
e4115acae6 removes duplicate root namespace 2021-03-04 17:02:14 +11:00