Commit Graph

44229 Commits

Author SHA1 Message Date
Bjarke Berg
61a28c9b34 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2024-01-23 16:21:59 +01:00
Bjarke Berg
c24cd2e53b Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2024-01-23 16:20:48 +01:00
Bjarke Berg
1886553148 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2024-01-23 16:20:24 +01:00
Ronald Barendse
b7e43a8def Get references from macro parameters using IDataValueReferenceFactory (#15625) 2024-01-23 16:08:17 +01:00
Bjarke Berg
b3d6c60ce2 Revert breaking changes 2024-01-23 14:46:58 +01:00
Bjarke Berg
4421b920f0 Revert breaking changes 2024-01-23 14:26:47 +01:00
Bjarke Berg
b853a5e14a Revert breaking changes 2024-01-23 14:11:42 +01:00
Bjarke Berg
088f907dcc Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueEditorReuseTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
2024-01-23 13:40:07 +01:00
Bjarke Berg
5b44503577 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyValueEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
2024-01-23 09:40:07 +01:00
Bjarke Berg
e55921ce80 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2024-01-23 09:35:52 +01:00
Ronald Barendse
cdbbd6a921 Optimize relation tracking for adding new and keeping existing relations (#15596)
* Include automatic relation type aliases from factory and fix SQL parameter overflow (#15141)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations (#15160)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations

* Always get all automatic relation type aliases

* Do not set relation type alias for unknown entity types

* Get references from recursive (nested/block) properties

* Optimize relation tracking for adding new and keeping existing relations

* Optimize getting references by grouping by property editor alias and avoiding duplicate parsing of the same value
2024-01-22 14:53:20 +01:00
Bjarke Berg
bee20b525f Post merge fix 2024-01-20 11:26:40 +01:00
Bjarke Berg
fbf3e6dc71 Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Core/Composing/BuilderCollectionBase.cs
2024-01-19 20:15:50 +01:00
Ronald Barendse
ce22315520 Backport relation tracking fixes and get references from recursive (nested/block) properties (#15593)
* Include automatic relation type aliases from factory and fix SQL parameter overflow (#15141)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations (#15160)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations

* Always get all automatic relation type aliases

* Do not set relation type alias for unknown entity types

* Get references from recursive (nested/block) properties

(cherry picked from commit 5198e7c52d)
2024-01-19 20:06:41 +01:00
Ronald Barendse
5198e7c52d Backport relation tracking fixes and get references from recursive (nested/block) properties (#15593)
* Include automatic relation type aliases from factory and fix SQL parameter overflow (#15141)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations (#15160)

* Include automatic relation type aliases from factory

* Remove unnessecary distinct and fix SQL parameter overflow issue

* Fixed assertions and test distinct aliases

* Simplified collection assertions

* Improve logging of invalid reference relations

* Always get all automatic relation type aliases

* Do not set relation type alias for unknown entity types

* Get references from recursive (nested/block) properties
2024-01-19 20:02:57 +01:00
Søren Kottal
bc803ae78b Fix RTE block rendering failing (#15583)
Adds optional class attribute to regex responsible for parsing RTE values to block models
2024-01-19 13:22:46 +01:00
Jacob Overgaard
9196d7ad00 V13: Rich text editor does not show its toolbar on grid layout rte's (#15595)
* synchronize normal rte with grid-rte

* restore pinToolbar and unpinToolbar from v10 and update to tinymce v6 and apply to grid-rte

* linting

* Reverting `pinToolbar` from v8

* remove unused variable

---------

Co-authored-by: leekelleher <leekelleher@gmail.com>
2024-01-18 13:19:36 +01:00
Jacob Overgaard
14299b6674 bump version to 13.2.0-rc 2024-01-17 15:10:14 +01:00
Kenn Jacobsen
a70c606c27 Do not log direct query inputs (#15577) 2024-01-15 14:14:27 +01:00
Andy Butland
49f5d2e2d4 Updates JSON schema for Umbraco 10 to include details of additional configuration introduced in Forms and Deploy. (#15566) 2024-01-12 13:13:20 +01:00
Nikolaj Geisle
597d8553c0 bump version.json 2024-01-11 12:49:33 +01:00
Elitsa Marinovska
57b3a196bf V10: Pass in variation context to published cache (#15563)
* Make sure that we always have variation context

* Fix references
2024-01-11 12:46:31 +01:00
Bjarke Berg
d3dc85f31f Only update security stamp once per request (#15562)
* Add item in requestcache when security stamp is already updated in request

* Propagate constructur obsoletion to implementing services and fix unit tests

---------

Co-authored-by: kjac <kja@umbraco.dk>
2024-01-11 10:20:58 +01:00
Jacob Overgaard
b916c85738 V13: TinyMCE does not toggle plugin buttons (#15558)
* bump tinymce from 6.8.1 to 6.8.2

* replace stateSelector with appropriate onSetup() functionality and replace addButton() with addToggleButton() to support toggling
2024-01-10 15:30:51 +01:00
Niels Lyngsø
83a0bf4f4b Fix: No Blocks Mode for RTE when required context for Blocks is not present (#15556)
* noBlocksMode

* another blockEditorApi check
2024-01-10 14:53:26 +01:00
Sven Geusens
9da46462f7 Run the same cleanup with scaffolding content as when copying. (#15541)
* Run the same cleanup with scaffolding content as when copying.

- Added a new ContentScaffoldedNotification
- Published the notification when a new scaffold has been created from a blueprint (content template)
- Linked up the ComplextPEContent handler to do the same cleanup for the new notification as when copying.
- registered handlers to the event for blocklist, blockgrid and nested content

* PR pattern matching suggestion

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
(cherry picked from commit dff90c6ec0)
2024-01-10 12:27:11 +01:00
Sven Geusens
dff90c6ec0 Run the same cleanup with scaffolding content as when copying. (#15541)
* Run the same cleanup with scaffolding content as when copying.

- Added a new ContentScaffoldedNotification
- Published the notification when a new scaffold has been created from a blueprint (content template)
- Linked up the ComplextPEContent handler to do the same cleanup for the new notification as when copying.
- registered handlers to the event for blocklist, blockgrid and nested content

* PR pattern matching suggestion

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
2024-01-10 12:22:36 +01:00
Bjarke Berg
f381e8391c Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
2024-01-10 08:32:02 +01:00
Bjarke Berg
a4f6c5d355 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2024-01-10 07:46:45 +01:00
Bjarke Berg
4463d04850 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2024-01-10 07:44:30 +01:00
dependabot[bot]
2e61d6449a Bump follow-redirects in /src/Umbraco.Web.UI.Client
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.9 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.9...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 10:57:36 +01:00
dependabot[bot]
e8eec901d1 Bump follow-redirects in /tests/Umbraco.Tests.AcceptanceTest
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 10:57:13 +01:00
Sebastiaan Janssen
94e8bc1db6 Merge branch 'v13/dev' into contrib 2024-01-09 08:59:48 +01:00
Markus Johansson
704aebed0c Fixes #15512 to allow curly braces in anchors 2024-01-08 15:23:25 +01:00
Aleksander
040495f359 Pass cache level to properties when creating published content in nucache
(cherry picked from commit d9d2b66e8580bc0cbdd42739a92cf9df16b4e96e)

# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
2024-01-08 14:42:17 +01:00
JesmoDev
06fdf8d3dc use opacity instead of hardcoded color (#15534) 2024-01-08 09:41:37 +01:00
Jacob Overgaard
77861ae55b V13: Load TinyMCE premium plugins through tiny.cloud (#15367)
* add tinymce cloud api key to configuration

* forward apikey through proxied config object after retrieving it from the server

* load the plugins.min.js file from tiny.cloud if cloud api key is set

* bump tinymce from 6.7.3 to 6.8.1

* disable premium promotion and make plugins unique

* make sure tinymce local assets are loaded before trying to load the plugins.js from cloud and before configuring tinymce
2024-01-08 08:58:57 +01:00
alevak09
cceabf88cd Update hr.xml (#15413)
Update croatian translation language file
2024-01-05 16:24:54 +00:00
Bjarne Fyrstenborg
425023f83b Ensure datepicker input is cleared (#15338) 2024-01-05 15:23:57 +00:00
Erik-Jan Westendorp
6c725dbd67 Fix aliases 2024-01-03 13:20:12 +01:00
Andy Butland
99119a506f Ensured removal of any auto-relations from custom relation types used in nested property values, to ensure there will be no duplicate error when the relations are saved. (#15447) 2024-01-03 10:50:58 +01:00
Shannon Deminick
a36c7beabf Decouple Lucene from Content Delivery API (#15493)
* Decouples Lucene from the Content Delivery API

* oops removes other refs
2024-01-02 16:20:53 +01:00
Sebastiaan Janssen
6258fa6a35 Merge branch 'v13/dev' into contrib
# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
2024-01-02 10:33:35 +01:00
Bjarke Berg
8b82addd53 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-12-22 14:11:21 +01:00
Bjarke Berg
3538737681 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-22 14:10:57 +01:00
Bjarke Berg
b0c5101b2b fix build 2023-12-22 14:10:00 +01:00
Bjarke Berg
23341c8f35 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-12-22 14:06:50 +01:00
Bjarke Berg
4489cf45d1 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-22 14:06:05 +01:00
Bjarke Berg
91e37b80e3 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-12-22 14:05:12 +01:00
Bjarke Berg
a2ad95d965 Change content 2023-12-22 13:49:57 +01:00