Bjarke Berg
|
fe36c80ba0
|
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
# src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
# src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
# src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
# src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
# src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
# src/Umbraco.Tests/Composing/TypeLoaderTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
# src/Umbraco.Tests/Services/MediaServiceTests.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.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/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
|
2021-05-11 12:33:31 +02:00 |
|
Bjarke Berg
|
261730f530
|
V9: Reintroduce missing friendly get crop url extensions (#10233)
* Adds missing extension methods of `GetCropUrl` that uses the service locator og inject the required services.
* Xml docs updated
|
2021-05-06 10:06:22 +02:00 |
|
Mole
|
b17c3158c0
|
Align namespaces in PropertyEditors to Umbraco.Cms.Core.*
|
2021-02-15 10:42:35 +01:00 |
|
Mole
|
55aa2edb72
|
Align namespaces in Umbraco.Web.Common
|
2021-02-10 11:42:04 +01:00 |
|
Mole
|
216fb87c79
|
Rename Umbraco.Core namespace to Umbraco.Cms.Core
|
2021-02-09 10:22:42 +01:00 |
|
Bjarke Berg
|
85c01d9905
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
# src/Umbraco.Configuration/Legacy/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Models/ContentBaseExtensions.cs
# src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Services/IRuntimeState.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/RuntimeState.cs
# src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# 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/Umbraco/config/lang/cs.xml
# src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Install/Controllers/InstallController.cs
# src/Umbraco.Web/PublishedElementExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UrlHelperExtensions.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
# src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
|
2020-12-01 11:34:13 +01:00 |
|
Bjarke Berg
|
38ee3c322d
|
Moved needed extension methods for the Gallery snippet..
|
2020-08-04 14:12:22 +02:00 |
|