Commit Graph

45130 Commits

Author SHA1 Message Date
Bjarke Berg
697c13c649 Merge remote-tracking branch 'origin/v13/dev' into v14/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/PreMigration/DataTypeSplitDataCollector.cs
2024-03-19 08:52:47 +01:00
Bjarke Berg
0ec9423e0a Merge remote-tracking branch 'origin/release/13.2' into v13/dev
# Conflicts:
#	version.json
2024-03-19 08:48:07 +01:00
Bjarke Berg
383617ec17 Fix after wrong log merge 2024-03-18 19:00:30 +01:00
Kenn Jacobsen
39085b9ad4 Add DB locking for container APIs (#15870) 2024-03-18 14:27:11 +01:00
Sven Geusens
a39030f4ba DataTypeSplit datacollector should not care about propertyEditors (#15898)
This ensures keys are correctly assumed to be unique => safe for dictionary usage

Co-authored-by: Sven Geusens <sge@umbraco.dk>
(cherry picked from commit e267b41575)
2024-03-18 13:21:35 +01:00
Elitsa Marinovska
e9cfcf4e99 Revoke previous sessions when AllowConcurrentLogins is false (#15892) 2024-03-18 13:18:57 +01:00
Sven Geusens
e267b41575 DataTypeSplit datacollector should not care about propertyEditors (#15898)
This ensures keys are correctly assumed to be unique => safe for dictionary usage

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2024-03-18 12:39:24 +01:00
Andreas Zerbst
76066eac5a Skipped failing tests (#15897) 2024-03-18 12:04:51 +01:00
Jacob Overgaard
82611f9fd2 update backoffice submodule 2024-03-18 11:59:05 +01:00
Mole
1408298adf V14: Extend IContentEntitySlim (#15890)
* Extend EntitySlim with key

* Add ListView to GenericContentEntityDto and ContentEntitySlim

* Move ContentTypeKey and ListViewKey back to BaseDto

* Remove extra DB call when mapping to DocumentTypeReferenceResponseModel

* Remove extra DB call when mapping to MediaTypeReferenceResponseModel

* Remove duplicate db call for members

* Remove now redundant base class

* Fix comment
2024-03-18 10:46:03 +01:00
Bjarke Berg
6e3496d3f5 Fix after merge
(cherry picked from commit 3e08ce1efb)

(cherry picked from commit 7e822bb8a1)
2024-03-18 08:53:35 +01:00
Bjarke Berg
14f3336941 Fixing locking issues for document type saves. (#15854)
* Added  ExecuteNonQuery(DbCommand command) on database to ensure we call OnExecutingCommand and OnExecutedCommand when executing DbCommands

* Added Cache Instructions lock, to avoid deadlocks

* Optimized read locks for nucache when only one content type is rebuilt

* Optimized the SqlServer locks, so only one command is executed (and thereby roundtrip) per lock instead of two

* Avoid breaking changes

* Cosmetic changes

* Take locks if everything is rebuild

* Use same lock in scopes, to avoid potential deadlocks between the two

* Use eager locks in PublishedSnapshotService.cs

* Added timeouts to some of the application locks

* Revert "Use eager locks in PublishedSnapshotService.cs"

This reverts commit 01873aae978ffa6e6686d253e482c493715e3a96.

* Revert "Added Cache Instructions lock, to avoid deadlocks"

This reverts commit e3fca7c12a804bb32ca1156b8abd42a957e9dc21.

* Use single readlock call to lock many

* Use eager locks for reads

* Eager write locks

* Ignore test of lazy locks

* Unique timeout exception messages

---------

Co-authored-by: kjac <kja@umbraco.dk>

(cherry picked from commit 2c23e67c65)
2024-03-18 08:53:15 +01:00
Bjarke Berg
352b6fa45b Bump version 2024-03-18 08:39:19 +01:00
Bjarke Berg
cb02c51da7 Merge remote-tracking branch 'origin/v13/dev' into v14/dev 2024-03-18 08:36:36 +01:00
Bjarke Berg
8696f66915 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2024-03-18 08:35:17 +01:00
Bjarke Berg
98de8acece Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2024-03-18 08:33:15 +01:00
Bjarke Berg
0f076f7a13 Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
2024-03-18 08:31:10 +01:00
Jey
b743f6a2df Merge pull request from GHSA-552f-97wf-pmpq
Co-authored-by: jey <jey@umbraco.dk>
2024-03-18 08:27:41 +01:00
Bjarke Berg
7e822bb8a1 Fix after merge
(cherry picked from commit 3e08ce1efb)
2024-03-15 17:16:04 +01:00
Bjarke Berg
6f26aae708 Update client 2024-03-15 17:13:16 +01:00
Bjarke Berg
17bc6f1d0c Merge remote-tracking branch 'origin/v13/dev' into v14/dev 2024-03-15 16:00:46 +01:00
Bjarke Berg
3e08ce1efb Fix after merge 2024-03-15 15:58:22 +01:00
Bjarke Berg
1011a2c1a6 Merge 2024-03-15 15:35:08 +01:00
Bjarke Berg
77bfff83f2 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2024-03-15 15:05:17 +01:00
Bjarke Berg
a34c63a313 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
2024-03-15 15:01:36 +01:00
Bjarke Berg
6ea84db0ae Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2024-03-15 14:55:56 +01:00
Nikolaj Geisle
0bafede51a Remove mention of backoffice project (#15894) 2024-03-15 13:40:09 +01:00
Mole
b619399edb Remove KeepAliveJob (#15891) 2024-03-15 12:48:31 +01:00
Jacob Overgaard
c2fe847ba5 update backoffice submodule 2024-03-15 11:46:19 +01:00
Kenn Jacobsen
469a54cbbe Workaround for failing entity tree children (#15887)
* Workaround for failing entity tree children

* Fix typo from original PR

* Expose and actually use GetPagedTrashedChildren on EntityService (the default implementation on the interface is currently used).

* Ensure that ID/Key mapping for recycle bins work
2024-03-15 11:21:36 +01:00
Bjarke Berg
2c23e67c65 Fixing locking issues for document type saves. (#15854)
* Added  ExecuteNonQuery(DbCommand command) on database to ensure we call OnExecutingCommand and OnExecutedCommand when executing DbCommands

* Added Cache Instructions lock, to avoid deadlocks

* Optimized read locks for nucache when only one content type is rebuilt

* Optimized the SqlServer locks, so only one command is executed (and thereby roundtrip) per lock instead of two

* Avoid breaking changes

* Cosmetic changes

* Take locks if everything is rebuild

* Use same lock in scopes, to avoid potential deadlocks between the two

* Use eager locks in PublishedSnapshotService.cs

* Added timeouts to some of the application locks

* Revert "Use eager locks in PublishedSnapshotService.cs"

This reverts commit 01873aae978ffa6e6686d253e482c493715e3a96.

* Revert "Added Cache Instructions lock, to avoid deadlocks"

This reverts commit e3fca7c12a804bb32ca1156b8abd42a957e9dc21.

* Use single readlock call to lock many

* Use eager locks for reads

* Eager write locks

* Ignore test of lazy locks

* Unique timeout exception messages

---------

Co-authored-by: kjac <kja@umbraco.dk>
2024-03-15 10:56:02 +01:00
Kenn Jacobsen
7964f33d0d Removed "type" from tree item response models (#15862) 2024-03-15 10:37:32 +01:00
Bjarke Berg
3718a9cdd4 Revert "Ignore test of lazy locks"
This reverts commit e03ff2661b.
2024-03-15 09:47:18 +01:00
Bjarke Berg
e03ff2661b Ignore test of lazy locks 2024-03-15 09:35:19 +01:00
Jacob Overgaard
ab3e420cd2 update backoffice submodule 2024-03-15 09:08:52 +01:00
Bjarke Berg
d82e262e13 Update imagesharp 3 2024-03-15 08:22:53 +01:00
Bjarke Berg
0e7e16f455 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2024-03-15 08:21:10 +01:00
Bjarke Berg
7585918821 Revert ImageSharp 3 upgrade due to breaking changes 2024-03-15 08:20:50 +01:00
Bjarke Berg
0e43c43609 Update imagesharp 3 2024-03-15 08:09:39 +01:00
Bjarke Berg
233452cb55 Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	src/Directory.Packages.props
2024-03-15 08:09:05 +01:00
Bjarke Berg
659e74d831 Update imagesharp 3 2024-03-15 08:08:27 +01:00
Bjarke Berg
b4e2191a4d Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	src/Directory.Packages.props
2024-03-15 08:07:14 +01:00
Bjarke Berg
fc86f2222c Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	src/Directory.Packages.props
2024-03-15 08:05:53 +01:00
Bjarke Berg
26958df79e Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Directory.Packages.props
2024-03-15 07:58:21 +01:00
Kenn Jacobsen
072903cb7a Port V13 backoffice cookie validation to V14 (#15886)
* Port V13 backoffice cookie validator to V14

* Don't use ISystemClock
2024-03-15 07:53:06 +01:00
Bjarke Berg
ed517ecd86 Update Imagesharp (#15885) 2024-03-14 14:31:30 +01:00
Nikolaj Geisle
6e1924d054 V14: Create member filter (#15877)
* Update filter to include membergroup name

* add filter by isApproved

* Add isLockedOut

* Implement member filter

* Move filter logic to repository

* Add more fields to sort by

* Update openApi

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2024-03-14 14:24:10 +01:00
Jacob Overgaard
88a1768b1d update backoffice submodule 2024-03-14 11:16:00 +01:00
Sven Geusens
ffcc4ac170 fix udi leaking in the management api (#15684)
* [WIP] Stop Udi leaking on ConterPicker

* Refined Udi conversion for contentPicker

Cleaned up base construcor usage to move away from the obsoleted one.

* Fixed Udi lieaking in MNTP

* Stopped Udi bleeding for MultiUrlPicker

* Remove unused assignment

* Resolved namespace issue

* Use correct configuration value for MNTP udi parsing

* Turn helper auto props into local helper function to avoid unnecesary serialization

* Remove Newtonsoft.Json from Multi URL picker

* Fixed MNTP configuration serialization

* Changed MNTP editor data from csv guid to EditorEntityReference[]

* Added remarks for the MNTP editor conversion logic

* Reworked MNTPPropertyEditor Unittests

changed intent of one
fixed bug because of 1 rework

* Update OpenApi.json

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: Elitsa <elm@umbraco.dk>
Co-authored-by: kjac <kja@umbraco.dk>
2024-03-14 11:06:46 +01:00
Jacob Overgaard
f41a4f1f06 update backoffice submodule 2024-03-14 10:48:03 +01:00