Sebastiaan Janssen
e626fca243
Merge branch 'v10/dev' into v10/contrib
...
# Conflicts:
# src/Umbraco.Core/Actions/ActionAssignDomain.cs
# src/Umbraco.Core/Actions/ActionCopy.cs
# src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs
# src/Umbraco.Core/Actions/ActionDelete.cs
# src/Umbraco.Core/Actions/ActionMove.cs
# src/Umbraco.Core/Actions/ActionNew.cs
# src/Umbraco.Core/Actions/ActionNotify.cs
# src/Umbraco.Core/Actions/ActionProtect.cs
# src/Umbraco.Core/Actions/ActionRestore.cs
# src/Umbraco.Core/Actions/ActionRights.cs
# src/Umbraco.Core/Actions/ActionRollback.cs
# src/Umbraco.Core/Actions/ActionSort.cs
# src/Umbraco.Core/Actions/ActionToPublish.cs
# src/Umbraco.Core/Actions/ActionUnpublish.cs
# src/Umbraco.Core/Actions/ActionUpdate.cs
# src/Umbraco.Core/Constants-Telemetry.cs
# src/Umbraco.Core/DependencyInjection/ServiceCollectionExtensions.cs
# src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
# src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
# src/Umbraco.Core/Models/Trees/ActionMenuItem.cs
# src/Umbraco.Core/Models/Trees/CreateChildEntity.cs
# src/Umbraco.Core/Models/Trees/ExportMember.cs
# src/Umbraco.Core/Models/Trees/MenuItem.cs
# src/Umbraco.Core/Models/Trees/RefreshNode.cs
# src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
# src/Umbraco.Core/PropertyEditors/NestedContentConfiguration.cs
# src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Services/IRedirectUrlService.cs
# src/Umbraco.Core/Services/RedirectUrlService.cs
# src/Umbraco.Core/Trees/MenuItemList.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs
# src/Umbraco.Infrastructure/Telemetry/Providers/SystemInformationTelemetryProvider.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs
# src/Umbraco.Web.UI.Client/src/less/navs.less
# templates/UmbracoProject/.gitignore
# tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
2022-07-11 15:04:46 +02:00
Nikolaj Geisle
e762fa91bc
V10: fix build warnings in Web.BackOffice ( #12479 )
...
* Run code cleanup
* Start manual run
* Finish dotnet format + manual cleanup
* Fix up after merge
* Fix substrings changed to [..]
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk >
Co-authored-by: Zeegaan <nge@umbraco.dk >
2022-06-20 08:37:17 +02:00
Bjarne Fyrstenborg
d051f850eb
Support SVG icon in action menu ( #12403 )
...
* Support custom SVG icon in menu item with legacy support
* Update menu icons
* Update action icons
* Adjust icons in menu actions with legacy fallback
* Don't use legacy icon
* Update comments
2022-05-17 07:50:19 +10:00
Andy Butland
96d33201aa
Few more NRT tweaks ( #12323 )
...
* Amended GetAll() on IDataTypeService to return an empty collection rather than null.
* Added a ClearSessionValue method to ISessionManager (given you can no longer set a value to null).
* Allow for null values in a StatefulNotification.
* Removed obsoletion of synchronous messages on TreeControllerBase.
* Fixed further CS8620 warnings in core project.
* Further fix to nullable warning.
* Aligned nullablility of retreiving tree nodes and menus, synchronously or asynchronously (such that we no longer can get null values, always empty collection objects).
2022-05-01 08:18:09 +02:00
Nikolaj Geisle
2460c82e02
Fix trees
2022-03-31 12:52:26 +02: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
Kenn Jacobsen
b05d71f76c
Replaced static events in TreeControllerBase with IEventAggregator notifications
2021-02-23 16:09:36 +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
Bjarke Berg
04bb4e99b6
Fixed possible null reference exceptions
2021-01-14 19:41:32 +01:00
Elitsa Marinovska
2204a57a8d
Signature changes of GetMenuForNode() & PerformGetMenuForNode()
2021-01-13 11:02:29 +01:00
Bjarke Berg
3ea7945f24
Get rid of system web in netcore and netstandard libraries
2020-08-05 08:44:22 +02:00
Bjarke Berg
835b04273f
Migrated remaining *TreeController's
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
2020-06-10 19:22:25 +02:00
