kjac
|
304a64be5a
|
Remove duplicate reference to Core
|
2023-10-23 14:00:33 +02:00 |
|
Bjarke Berg
|
912e9f277e
|
post merge fix
|
2023-09-20 10:02:25 +02:00 |
|
Bjarke Berg
|
ed73b82fd0
|
Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
# tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs
# tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentServiceTests.cs
|
2023-09-20 09:51:56 +02:00 |
|
Bjarke Berg
|
4dd3c295e0
|
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
|
2023-09-20 09:43:41 +02:00 |
|
Bjarke Berg
|
3c81f968c3
|
post merge clean up
|
2023-06-21 08:53:18 +02:00 |
|
Bjarke Berg
|
7ab6598d0b
|
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
|
2023-06-21 08:41:35 +02:00 |
|
Nikolaj Geisle
|
02669e930c
|
V12: Update dependencies to latest (#14204)
* Update dependencies to latest
* revert npoco back to 5.5.0
* Updated Npoco and Serilog
---------
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
|
2023-05-11 13:32:14 +02:00 |
|
Bjarke Berg
|
61a33c734c
|
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
# src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
|
2023-03-29 10:30:16 +02:00 |
|
Nikolaj Geisle
|
79a9d73a90
|
Remove old proj ref to core from cs proj (#13870)
Co-authored-by: Zeegaan <nge@umbraco.dk>
|
2023-02-21 12:17:17 +01:00 |
|
Bjarke Berg
|
776f5ce1a0
|
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
|
2023-02-15 14:06:39 +01:00 |
|
Ronald Barendse
|
2e54579a2f
|
Simplify JSON schema, generation, copying and updating (#13427)
* Simplify JSON schema and only generate appsettings-schema.Umbraco.Cms.json
* Use Umbraco.JsonSchema.Extensions to dynamically add JSON schema references
* Move DependentUpon items to shared MSBuild props
* Update LangVersion to latest
* Update Umbraco.GitVersioning.Extensions to 0.2.0
* Remove JSON schemas on clean
* Remove Umbraco.JsonSchema.Core project
* Fix JSON schema nullability
* Ignore additional JSON schema files in template
* Update CompatibilitySuppressions.xml
* Remove GlobalSettings.UmbracoPath from JSON schema again
* Remove RemoveUmbracoJsonSchemaFiles target
* Update Umbraco.JsonSchema.Extensions to 0.2.0 and add weights
* Flatten generated JSON schema hierarchy
* Remove LicensesSettings from CMS codebase
* Change AdditionalParameters to IDictionary
|
2022-11-22 12:48:11 +01:00 |
|