Commit Graph

43540 Commits

Author SHA1 Message Date
Bjarke Berg
843d41e564 Update .net 8 to preview 7 2023-08-09 15:53:31 +02:00
Bjarke Berg
5327413092 Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	version.json
2023-08-09 15:28:49 +02:00
Bjarke Berg
f7e6480f4b Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-08-09 15:27:39 +02:00
Bjarke Berg
d421be9d3c Added Indexing to v11+ UmbracoCmsSchema.cs 2023-08-09 15:27:13 +02:00
Bjarke Berg
5fbc922814 Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/JsonSchema/AppSettings.cs
2023-08-09 15:27:01 +02:00
Bjarke Berg
667627a6e2 Merge remote-tracking branch 'origin/release/12.1' into v12/dev 2023-08-09 13:21:20 +02:00
Sven Geusens
d9c3ebdfe8 Bugfix 31584 - Remove Lazy "caching" that retains keys of deleted ContentTypes which causes unecesary validation errors (#14643)
The validation errors should not happen as the model mapping cleans up block data for entity types that do not longer exist (which is checked on the aformentioned key)

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-08-09 13:12:39 +02:00
Sven Geusens
d3243f8700 Bugfix 31584 - Remove Lazy "caching" that retains keys of deleted ContentTypes which causes unecesary validation errors (#14643)
The validation errors should not happen as the model mapping cleans up block data for entity types that do not longer exist (which is checked on the aformentioned key)

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-08-09 13:11:44 +02:00
Bjarke Berg
ea51daa086 bump version 2023-08-09 13:09:16 +02:00
Bjarke Berg
336ba22a01 Merge remote-tracking branch 'origin/release/12.1' into v12/dev 2023-08-09 13:08:50 +02:00
Bjarke Berg
a4f84ed490 Added Indexing to v11+ UmbracoCmsSchema.cs 2023-08-09 11:51:47 +02:00
Bjarke Berg
945e3be553 Add config so it is configurable whether to explicitly index each nested property (#14648)
* Added new configuration "Umbraco:CMS:Examine:ExplicitlyIndexEachNestedProperty" that can be used to avoid nested properties like block grid to index each property individually.

* Moved the setting "Umbraco:CMS:Examine:ExplicitlyIndexEachNestedProperty" to "Umbraco:CMS:Indexing:ExplicitlyIndexEachNestedProperty" to make it more future proof

* Added missing registration

* Fixed registration

* Small readability improvement

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-08-09 11:51:01 +02:00
Bjarke Berg
264e4f8b57 Add config so it is configurable whether to explicitly index each nested property (#14648)
* Added new configuration "Umbraco:CMS:Examine:ExplicitlyIndexEachNestedProperty" that can be used to avoid nested properties like block grid to index each property individually.

* Moved the setting "Umbraco:CMS:Examine:ExplicitlyIndexEachNestedProperty" to "Umbraco:CMS:Indexing:ExplicitlyIndexEachNestedProperty" to make it more future proof

* Added missing registration

* Fixed registration

* Small readability improvement

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
2023-08-09 11:47:45 +02:00
Bjarke Berg
cae22a6b9f bump version 2023-08-09 08:39:53 +02:00
Sven Geusens
2b3f048db7 Revert "Implemented modular architecture for filestream security sanitization with an svg-html example"
This reverts commit 18ee016ae9.
2023-08-08 16:26:59 +02:00
Sven Geusens
18ee016ae9 Implemented modular architecture for filestream security sanitization with an svg-html example 2023-08-08 14:49:18 +02:00
Bjarke Berg
dce320839c Updated .net 8 to preview 6 2023-08-08 12:05:53 +02:00
Bjarke Berg
df16f4fbd2 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-08-08 11:40:45 +02:00
Bjarke Berg
85311f9277 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	src/Umbraco.Core/Events/EventAggregator.Notifications.cs
#	src/Umbraco.Core/Events/EventAggregator.cs
2023-08-08 11:30:40 +02:00
Bjarke Berg
7cf4826e2f Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-08-08 11:26:01 +02:00
Bjarke Berg
512199c8ab Pass the existing notification state to the ContentUnpublishingNotification so it can be shared. (#14638) 2023-08-08 09:40:44 +02:00
Bjarke Berg
4e410a9dd5 Stop event propagation when clicking on the expand-arrow in the tree. (#14637) 2023-08-08 09:27:23 +02:00
Bjarke Berg
ef13b1fe1f Merge remote-tracking branch 'origin/release/12.1' into v12/dev 2023-08-07 20:16:45 +02:00
Bjarke Berg
dddabdb8dc Small changes to the EF Core implementations (#14640)
* Added explicit migration for AddOpenIddict and

* Renamed the UmbracoOpenIddictDbContextModelSnapshot to UmbracoDbContextModelSnapshot to align with the name of the DBContext

* Added comment to UmbracoDbContext about it is for internal use

* Only execute all migrations at initial install time

---------

Co-authored-by: kjac <kja@umbraco.dk>
2023-08-07 19:16:35 +02:00
Jacob Overgaard
e16e36c68f V12: Remove avatar step from login (#14629)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2023-08-07 11:02:53 +02:00
Jacob Overgaard
cf12de50d8 V12: Remove avatar step from login (#14629)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2023-08-07 11:00:48 +02:00
Rasmus Söderström
7d253d3454 Fix for #14565 - Empty DocType folders hidden (#14581) 2023-08-07 08:48:14 +02:00
Erik-Jan Westendorp
0046f1a9f8 Add missing translation (#14588) 2023-08-07 08:47:07 +02:00
Bjarke Berg
b10b77bb08 Allow newlines in invite email and escape other html (#14618) 2023-08-07 08:19:43 +02:00
Jacob Overgaard
1d8ad9dabb V12: Remove avatar step from login (#14629)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2023-08-04 16:20:27 +02:00
Sebastiaan Janssen
772fa5e23b Revert "Fix for escaping markdown characters in property descriptions (#12345)"
This reverts commit 4aa1597138.
2023-08-02 15:15:11 +02:00
Bjarke Berg
f384e0c30c Allow newlines in invite email and escape other html (#14618) 2023-08-02 14:17:39 +02:00
Bjarke Berg
0d82258803 Allow newlines in invite email and escape other html (#14618) 2023-08-02 12:39:06 +02:00
Bjarke Berg
04b74dddd0 Added missing async awaits in notifications that ensures objects are not disposed too early
Fixes https://github.com/umbraco/Umbraco-CMS/issues/14574
2023-08-02 11:37:39 +02:00
Bjarke Berg
e48350e064 Added missing async awaits in notifications that ensures objects are not disposed too early
Fixes https://github.com/umbraco/Umbraco-CMS/issues/14574
2023-08-02 11:29:02 +02:00
Migaroez
85b3d006bf Merge pull request #14626 from umbraco/v12/bugfix/14574_fixed_issue_with_disposed_objects_in_async_notifications
Fixed issue with disposed objects in async notifications
2023-08-02 11:26:05 +02:00
Bjarke Berg
6d64cfbbc4 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-08-02 10:23:32 +02:00
Bjarke Berg
982dd3700d Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
2023-08-02 10:13:02 +02:00
Bjarke Berg
8ce48a2634 post merge fix 2023-08-02 10:01:20 +02:00
Bjarke Berg
dcdbdbfadd Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
2023-08-02 09:53:17 +02:00
Bjarke Berg
bbaa2a2212 Added CompatibilitySuppressions for .NET7 2023-08-02 09:46:31 +02:00
Bjarke Berg
41625e3ad2 Updated template to .net8 2023-08-02 09:46:14 +02:00
Sebastiaan Janssen
bc127d95ba Fixed note on #13145 - don't make IncludeDescendants settable 2023-08-01 16:11:44 +02:00
Bjarke Berg
c11d0d3f5a Added missing async awaits in notifications that ensures objects are not disposed too early
Fixes https://github.com/umbraco/Umbraco-CMS/issues/14574
2023-08-01 14:23:30 +02:00
Nikolaj Geisle
8797e93f2e Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-07-25 11:37:04 +02:00
Nikolaj Geisle
978da0384e Merge v11 into v12 (#14604)
* V12: Dropzone should handle internal and external errors when uploading (#14579)

* fix: for safety measure check that a file is truthy before trying to upload it

* fix: push an error when file.$error is encountered to make sure it does not get uploaded

* fix: mark file as done if it errors

* format error messages

* fix: check for maxFileSize before uploading pasted images in tinymce

* remove the image from the DOM if any error is encountered

* feat: add property to fileManager to get and format the maxFileSize

* fix: make tinymce use fileManager to get maxFileSize

* fix(image cropper): check for maxFileSize before setting file to upload

* multiply by 1000 to get bytes

* V11/merge v10 into v11 (#14602)

* V10: Dropzone should handle internal and external errors when uploading (#14578)

* fix: mark files that result in error as processed

* fix: for safety measure check that a file is truthy before trying to upload it

* fix: push an error when file.$error is encountered to make sure it does not get uploaded

* fix: remove header from error messages since it is not being used anyway

* fix: check for maxFileSize before uploading pasted images in tinymce

* use stored blob variable

* feat: add property to fileManager to get and format the maxFileSize

* fix: make tinymce use fileManager to get maxFileSize

* fix(image cropper): check for maxFileSize before setting file to upload

* multiply by 1000 to get bytes

---------

Co-authored-by: Elitsa <elm@umbraco.dk>

* Fix method invoke. (#14597)

* Ensure that the Slider does not crash the back-office (#14601)

* Ensure that the Slider does not crash the back-office

* Add field descriptions to config

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Elitsa <elm@umbraco.dk>
Co-authored-by: Adrian Cojocariu <95346674+acoumb@users.noreply.github.com>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Elitsa <elm@umbraco.dk>
Co-authored-by: Adrian Cojocariu <95346674+acoumb@users.noreply.github.com>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
2023-07-25 11:16:00 +02:00
Nikolaj Geisle
c8206cd7d7 V11/merge v10 into v11 (#14602)
* V10: Dropzone should handle internal and external errors when uploading (#14578)

* fix: mark files that result in error as processed

* fix: for safety measure check that a file is truthy before trying to upload it

* fix: push an error when file.$error is encountered to make sure it does not get uploaded

* fix: remove header from error messages since it is not being used anyway

* fix: check for maxFileSize before uploading pasted images in tinymce

* use stored blob variable

* feat: add property to fileManager to get and format the maxFileSize

* fix: make tinymce use fileManager to get maxFileSize

* fix(image cropper): check for maxFileSize before setting file to upload

* multiply by 1000 to get bytes

---------

Co-authored-by: Elitsa <elm@umbraco.dk>

* Fix method invoke. (#14597)

* Ensure that the Slider does not crash the back-office (#14601)

* Ensure that the Slider does not crash the back-office

* Add field descriptions to config

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Elitsa <elm@umbraco.dk>
Co-authored-by: Adrian Cojocariu <95346674+acoumb@users.noreply.github.com>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
2023-07-25 10:18:49 +02:00
Kenn Jacobsen
43700d2bcb Ensure that the Slider does not crash the back-office (#14601)
* Ensure that the Slider does not crash the back-office

* Add field descriptions to config
2023-07-25 08:39:59 +02:00
Adrian Cojocariu
eed9feb5f3 Fix method invoke. (#14597) 2023-07-24 15:18:23 +02:00
Jacob Overgaard
24844c6ce2 V12: Dropzone should handle internal and external errors when uploading (#14579)
* fix: for safety measure check that a file is truthy before trying to upload it

* fix: push an error when file.$error is encountered to make sure it does not get uploaded

* fix: mark file as done if it errors

* format error messages

* fix: check for maxFileSize before uploading pasted images in tinymce

* remove the image from the DOM if any error is encountered

* feat: add property to fileManager to get and format the maxFileSize

* fix: make tinymce use fileManager to get maxFileSize

* fix(image cropper): check for maxFileSize before setting file to upload

* multiply by 1000 to get bytes
2023-07-24 10:20:07 +02:00