Commit Graph

43488 Commits

Author SHA1 Message Date
Bjarke Berg
1033806c49 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-06-12 10:05:49 +02:00
Bjarke Berg
f24ff4918e Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-06-12 10:03:26 +02:00
Nikolaj Geisle
89d670372d Update security stamps on logout (#14362)
Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-06-12 09:56:04 +02:00
Kenn Jacobsen
cbf42bd91a Make the API versioning and Swagger config less intrusive (#14363) 2023-06-12 09:31:39 +02:00
Kenn Jacobsen
6b280bd165 Make the Delivery API JSON type info resolver un-sealed (#14368) 2023-06-12 07:58:35 +02:00
Mole
45fd5d218b Use ComputeHMACAsync instead of ComputeHMAC in URL generator (#14364) 2023-06-09 09:20:07 +02:00
Nikolaj Geisle
8b7094c8cf V12: use database when testing examine (#14360)
* Use databases for examine tests

* Use same schema for entire fixture

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-06-08 12:05:10 +02:00
Bjarne Fyrstenborg
d9dced55c4 Disable sortable if readonly or max is limited to one item (#14252)
* Disable sortable if readonly or max is set limited to one item

* Disable sortable on single URL picker

* Don't disable block list sorting based on validation limit, but do for single block mode

* Disable sorting in media picker 3 in single mode

* Remove extra whitespace

* Disable draggable

* Tweaked wording of "item(s)"

---------

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Emma Garland <emma.garland@rocksolidknowledge.com>
2023-06-08 10:31:16 +01:00
Jesse
4aa1597138 Fix for escaping markdown characters in property descriptions (#12345)
* Added secure to the UMB-XSRF-V cookie when global https is true.

* tweaked markdown handling

* added in link handling tweak for simpleMarkdown filter

* tweaked simple markdown filter to modify all links instead of just the first one

* moved transformation of markdown content in description into C# code

* Format of white space

* Reverted unecessary change.

* Removed unwanted framework version lines

* Reduce nesting of if statements.

* Changed to .Contains for readability.

---------

Co-authored-by: Corey Philipp <CPhilipp@dewpoint.com>
Co-authored-by: jaandrews <jaandrews88@gmail.com>
Co-authored-by: Emma Garland <emma.garland@rocksolidknowledge.com>
2023-06-08 10:11:18 +01:00
Kenn Jacobsen
ddade09b14 Fix broken name sorting in the Delivery API (#14350) 2023-06-08 10:59:29 +02:00
Sebastiaan Janssen
8447350915 Merge branch 'v12/dev' into contrib 2023-06-08 10:24:39 +02:00
Bjarke Berg
c9bb48aabf Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-06-08 10:10:45 +02:00
Bjarke Berg
96dc594269 Merge remote-tracking branch 'origin/v11/dev' into release/12.0
# Conflicts:
#	tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
#	version.json
2023-06-08 08:37:30 +02:00
Bjarke Berg
8ae0c82e85 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-06-08 08:36:15 +02:00
Lili Rossiter
b60ddf484f fix for focus state of checkbox 2023-06-07 14:01:13 +02:00
Chad
e784cfa960 Improve logging performance by checking Trace/Debug log level is enabled (#12793) 2023-06-07 11:47:05 +02:00
Mole
b5ab115318 Remove external login tokens before removing external logins (#14341) 2023-06-06 14:11:20 +02:00
nikolajlauridsen
599bfea496 Bump version 2023-06-06 13:52:53 +02:00
nikolajlauridsen
537e078d43 Merge branch 'release/12.0' into v12/dev 2023-06-06 13:52:17 +02:00
nikolajlauridsen
a6bb637fab Add scopes to tests 2023-06-06 12:24:29 +02:00
Mole
4744d711ed Use scopes in PackaginService (#14343) 2023-06-06 12:00:53 +02:00
Mole
2dd7d610da Update OpenIdDict (#14340) 2023-06-06 10:15:53 +02:00
Mole
cd3f06349b Update OpenIdDict (#14340) 2023-06-06 10:15:31 +02:00
Mole
b391fc50e9 Remove external login tokens before removing external logins (#14341) 2023-06-06 09:29:03 +02:00
Kenn Jacobsen
809883f088 Support entirely unpublished content in preview mode (#14307)
* Support draft-only content in the Delivery API query

* Allow outputting "entirely unpublished" content

* Make the preview path explicit to avoid clashing endpoints

* Handle trailing slash setting for preview URLs

* Update src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexValueSetBuilder.cs

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

* Remove superfluous (and incorrect) unpublished route handling

* Make sure preview output includes routes for unpublished cultures

* Ensure that published content with unpublished ancestors are available in preview

* Fix route start item when previewing published content with unpublished parent

---------

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2023-06-05 12:00:25 +02:00
Nikolaj Geisle
c65f22a1d6 Use hosting environment to get local temp path (#14335) 2023-06-05 10:57:39 +02:00
Nikolaj Geisle
6073662140 Use hosting environment to get local temp path (#14335) 2023-06-05 10:56:56 +02:00
Arkadiusz Biel
9bafdbd992 Add notification flag to indicate the current publish operation includes descendants (#13145) 2023-05-31 17:33:23 +02:00
Bjarne Fyrstenborg
676efb9f89 Show summary of Examine search results (#14300) 2023-05-31 17:25:24 +02:00
Callum Whyte
e6903bffcd Convert collections for XPath in PropertyValueConverterBase (#14275) 2023-05-31 16:58:42 +02:00
Miguel Pinto
76cb85224e Swapped the sortCreateDateAscending and sortCreateDateDescending translation values to match the intended behavior (#14315) 2023-05-31 16:39:37 +02:00
Ahmet
cf6a7a3bc0 Fix #14270 - ImageCropperValue.GetCropUrl(alias, imageUrlGenerator) always returns null (#14308) 2023-05-31 13:47:09 +02:00
Russell
dd59ef17f5 Fix for User null from IP address "::1" has logged out (#14322) 2023-05-31 12:46:02 +02:00
Russell
0220621337 Change "Media Picker" in RTE to "Image Picker" (#14321) 2023-05-31 12:45:02 +02:00
Kenn Jacobsen
184cf9f26d Fix URL encoded paths for the item endpoint (#14311)
* Fix URL encoded paths for the item endpoint

* Sanity check accept-language headers before accepting them

---------

Co-authored-by: Elitsa <elm@umbraco.dk>
2023-05-31 12:14:26 +02:00
Ronald Barendse
41e51d6e71 Add PackageId to package manifest and PackageMigrationPlan (#14047)
* Add VersionAssemblyName to package manifest

* Fix/improve nullability

* Ensure package version from manifest is set when package migration exists

* Set versionAssemblyName in umbracopackage template

* Use Assembly.Load instead of ITypeFinder

* Use AssemblyLoadContext to get asesmbly by name

* Add PackageId to package manifest

* Show ID on installed packages overview

* Fallback to package ID to get assembly version

* Include package ID in telemetry data

* Set id in umbracopackage template

* Add PackageId to PackageMigrationPlan

* Get version from package migration assembly

* Hide unknown package version

* Always use package name from manifest

* Use IPackagingService to return package telemety data

* Set versionAssemblyName in umbracopackage-rcl template

* Set id in umbracopackage-rcl template
2023-05-31 11:31:37 +02:00
Bjarke Berg
82746518d4 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
#	version.json
2023-05-31 09:11:24 +02:00
Bjarke Berg
2407d42de6 Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Core/Constants-Telemetry.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
2023-05-31 08:48:28 +02:00
Kenn Jacobsen
3b433e6658 Expose "expanding" state in API value conversion (#14312)
* Expose "expanding" state in API value conversion

* Add unit test

* Add non-breaking and obsoletion

* Add compat suppressions
2023-05-31 08:46:30 +02:00
Nikolaj Geisle
407263d090 V10: Handle blob images (#14317)
* Handle blob images

* remove dots from mapping

* Revert bad formatting

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-05-31 08:43:14 +02:00
Ronald Barendse
84a0cd8c09 Add VersionAssemblyName to package manifest (#14046)
* Add VersionAssemblyName to package manifest

* Fix/improve nullability

* Ensure package version from manifest is set when package migration exists

* Set versionAssemblyName in umbracopackage template

* Use Assembly.Load instead of ITypeFinder

* Use AssemblyLoadContext to get asesmbly by name

* Get version from package migration assembly

* Hide unknown package version

* Set versionAssemblyName in umbracopackage-rcl template
2023-05-30 15:47:36 +02:00
michiel-sj
0f18b50126 Adding logging and make sure PostAddFile always releases the file semaphore (#14269) 2023-05-26 13:51:29 +02:00
Elitsa Marinovska
fcf477191f Delivery API: Adding support for "Contains" filters (#14289)
* Adding support for contains filters

* Making a dedicated name filter and making changes to the sort indexer

* Fixed the merge from release/12.0

* Make the "name" filter support OR for comma separated filter values

---------

Co-authored-by: kjac <kja@umbraco.dk>
2023-05-25 13:43:45 +02:00
Nikolaj
9ed54eb158 Fix version 2023-05-25 13:03:13 +02:00
Nikolaj
c6d94b3fd4 Merge remote-tracking branch 'origin/release/11.4' into v11/dev 2023-05-25 12:59:24 +02:00
dependabot[bot]
fccbed125c Bump engine.io and socket.io in /src/Umbraco.Web.UI.Client
Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `engine.io` from 6.2.1 to 6.4.2
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.2.1...6.4.2)

Updates `socket.io` from 4.5.3 to 4.6.1
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.5.3...4.6.1)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 11:33:19 +02:00
Bjarke Berg
efb9452678 Merge remote-tracking branch 'origin/release/12.0' into v12/dev
# Conflicts:
#	src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryProvider.cs
#	src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryService.cs
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryProvider.cs
2023-05-25 11:29:10 +02:00
dependabot[bot]
715dfa7ee0 Bump qs from 6.10.1 to 6.11.0 in /src/Umbraco.Web.UI.Docs
Bumps [qs](https://github.com/ljharb/qs) from 6.10.1 to 6.11.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.1...v6.11.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 11:28:48 +02:00
Kenn Jacobsen
53e0227c98 Fix the namespace for PagedModel (#14296)
* Fix the namespace for PagedModel

* Add compat suppressions
2023-05-25 11:27:37 +02:00
dependabot[bot]
010a1b53f6 Bump decode-uri-component in /src/Umbraco.Web.UI.Docs
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 11:27:16 +02:00