Benjamin Carleski
|
bcd26b9243
|
Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/IImageUrlGenerator.cs
# src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/Testing/UmbracoTestBase.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
|
2020-02-11 16:53:13 -08:00 |
|
Bjarke Berg
|
58f9b48e16
|
Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core
# Conflicts:
# src/Umbraco.Abstractions/UriExtensions.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
# src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
# src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
|
2020-01-07 09:46:42 +01:00 |
|
Andy Butland
|
bd5b344a57
|
Merge branch 'netcore/dev' into feature/7371-short-string-helper
# Conflicts:
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/TypeExtensions.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
# src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
# src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
# src/Umbraco.Tests/Strings/StringExtensionsTests.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
# src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
# src/Umbraco.Web/Editors/CodeFileController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/CurrentUserController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MacroRenderingController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.Web/Runtime/WebInitialComponent.cs
# src/Umbraco.Web/Templates/TemplateRenderer.cs
|
2019-12-24 09:08:47 +01:00 |
|
Andy Butland
|
d469a2153b
|
Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection.
|
2019-12-20 17:36:44 +01:00 |
|
Bjarke Berg
|
dfeb97caa4
|
AB3677 - Moved usages of Current (Core) to Current (Web)
|
2019-12-19 15:53:50 +01:00 |
|
Bjarke Berg
|
6c923bc9b4
|
AB4227 - Moved a mix of files
|
2019-12-18 13:42:33 +01:00 |
|
Bjarke Berg
|
9e5494cc14
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
# src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Published/NestedContentTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
|
2019-12-11 09:29:36 +01:00 |
|
Bjarke Berg
|
becce7800b
|
Moved Models from Umbraco.Core to Umbraco.Infrastructure
|
2019-12-09 14:12:06 +01:00 |
|
Shannon
|
602acce8f4
|
Gets entity repository to be able to return a mix of object types
|
2019-11-05 15:50:49 +11:00 |
|
Rasmus John Pedersen
|
ae6004166f
|
Disallow deleting "Sensitive data" user group
|
2019-09-26 18:40:45 +02:00 |
|
Rasmus John Pedersen
|
6beb84442c
|
Disable rename alias of system user groups
|
2019-09-26 18:34:48 +02:00 |
|
Benjamin Carleski
|
e495faf83c
|
Fix FIPS compliance, add FIPS tests (#5978)
|
2019-08-07 19:31:08 +02:00 |
|
leekelleher
|
580ba79619
|
Icon Constants consistency
Updated the `Constants.Icons` and replaced the hard-coded strings with
the const references.
|
2019-06-27 22:35:29 +02:00 |
|
Stephan
|
6c8ded6275
|
Better mapping of enumerable
|
2019-04-08 16:41:33 +02:00 |
|
Stephan
|
9eb1415796
|
Fix mapping of enumerable
|
2019-04-08 10:05:21 +02:00 |
|
Stephan
|
8049c40f90
|
Stop exposing mapper in MapperContext
|
2019-04-07 11:26:47 +02:00 |
|
Stephan
|
0a4465f721
|
Fix mapping comment
|
2019-04-06 18:35:07 +02:00 |
|
Kenn Jacobsen
|
851f74528f
|
Include UserGroup ID when mapping UserGroup to AssignedUserGroupPermissions
|
2019-04-06 08:18:40 +02:00 |
|
Stephan
|
aad245d5a8
|
Fix mappers
|
2019-04-03 11:17:51 +02:00 |
|
Stephan
|
7a6884d208
|
Rename mapper stuff
|
2019-04-03 10:39:49 +02:00 |
|