Andy Butland
44aa5dcf1c
Provides an abstraction for creating the JavaScriptEncoder used in SystemTextConfigurationEditorJsonSerializer ( #19849 )
...
* Provides an abstraction for creating the JavaScriptEncoder used in SystemTextConfigurationEditorJsonSerializer.
* Generalised JSON serialization encoder factory to work for all System.Tex.Json serializers.
Added the serializer's name as a parameter to allow for different encodings per serializer if required.
* Fixed tests by removing use of obsolete constructors.
* Removed name parameter and used a generic type instead.
2025-08-07 09:08:09 +02:00
Bjarke Berg
520309e3f8
Merge remote-tracking branch 'origin/v12/dev' into v14/dev
...
# Conflicts:
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs
2023-06-12 10:10:08 +02:00
Ahmet
cf6a7a3bc0
Fix #14270 - ImageCropperValue.GetCropUrl(alias, imageUrlGenerator) always returns null ( #14308 )
2023-05-31 13:47:09 +02:00
Bjarke Berg
5dd945f372
Reintroduced management api after v12 merge
2023-05-09 09:21:16 +02:00
Bjarke Berg
0f1c2f7022
Ensure no management api for v12 ( #14197 )
...
* Remove management api
* Remove actual files
2023-05-04 13:32:41 +02:00
Kenn Jacobsen
1b8ce54e49
Remove Json.NET dependencies for more property editors ( #13912 )
...
* Make the Tags property editor JSON serialization agnostic
* Make the Multiple Value editor JSON serializer agnostic
* Make Media Picker 3 value converter work with System.Text.Json instead of Json.NET
* Make Image Cropper value converter work with System.Text.Json instead of Json.NET
* Remove Json.NET dependencies from ImageCropperTemplateExtensions
* Update src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
* Update src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
* Update src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
* Update src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
* Update src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
* Update src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
---------
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com >
2023-03-07 14:31:27 +01:00
Nikolaj Geisle
7aeb400fce
V10: fix build warnings in test projects ( #12509 )
...
* Run code cleanup
* Dotnet format benchmarks project
* Fix up Test.Common
* Run dotnet format + manual cleanup
* Run code cleanup for unit tests
* Run dotnet format
* Fix up errors
* Manual cleanup of Unit test project
* Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
* Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
* Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
* Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
* Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
* Fix according to review
* Fix after merge
* Fix errors
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk >
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch >
Co-authored-by: Zeegaan <nge@umbraco.dk >
2022-06-21 08:09:38 +02:00
Bjarke Berg
52a3e285a9
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
...
# Conflicts:
# src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
# src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Core/Manifest/PackageManifest.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Core/Models/PropertyTagsExtensions.cs
# src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
# src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Core/Serialization/JsonToStringConverter.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Telemetry/ITelemetryService.cs
# src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs
# src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
# src/Umbraco.Core/Telemetry/TelemetryService.cs
# src/Umbraco.Tests/Manifest/ManifestParserTests.cs
# src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
# src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
# src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
# src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
# src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Compose/BlockEditorComponent.cs
# src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
# src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/Telemetry/ReportSiteTask.cs
# src/Umbraco.Web/Telemetry/TelemetryComponent.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs
2022-01-21 12:40:18 +01:00
Nikolaj Geisle
e0701ccd48
Merge branch 'v9/dev' into v9/feature/update-imagesharp-web
...
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
# src/Umbraco.Web.UI/umbraco/config/lang/cy.xml
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts
2021-11-24 09:11:52 +01:00
Paul Johnson
00133e880d
Move test projects from src/ to tests/ ( #11357 )
...
* Update gitignore
* Move csproj
* Update project references
* Update solutions
* Update build scripts
* Tests used to share editorconfig with projects in src
* Fix broken tests.
* Stop copying around .editorconfig
merged root one with linting
* csharp_style_expression_bodied -> suggestion
* Move StyleCop rulesets to matching directories and update shared build properties
* Remove legacy build files, update NuGet.cofig and solution files
* Restore myget source
* Clean up .gitignore
* Update .gitignore
* Move new test classes to tests after merge
* Gitignore + nuget config
* Move new test
Co-authored-by: Ronald Barendse <ronald@barend.se >
2021-10-18 08:14:04 +01:00
