yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,516 Commits 4 Branches 7 Tags
b9c0e18fb1613cf8dbe242b7fc69356e3cb26ff4
Commit Graph

43516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
b9c0e18fb1 Merge remote-tracking branch 'origin/v12/dev' into v14/dev 
# Conflicts:
#	src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryService.cs
#	src/Umbraco.Core/CompatibilitySuppressions.xml
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryProvider.cs
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryService.cs
#	src/Umbraco.Core/DeliveryApi/NoopApiContentQueryService.cs
 2023-05-25 14:51:28 +02:00
Bjarke Berg
32b3b3b4a0 Updated version number 2023-05-25 13:35:11 +02:00
Bjarke Berg
e04bb9d18d Fix tests by updating OpenApi.json 2023-05-25 12:34:26 +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
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
Jacob Overgaard
b245f319d9 update backoffice submodule 2023-05-25 11:20:16 +02:00
Jacob Overgaard
7f798bcc91 v12: add support for Node.js 18 (#14259) 
* add .nvmrc to instruct NVM of preferred version

* update azure-pipelines.yml with node 18.16

* update "engines" section of package.json with preferred node.js 18.16

* update lockfiles in accordance with node 18 (lockfileVersion: 3)
 2023-05-25 11:19:03 +02:00
Bjarke Berg
803e1be7dd Add PKCE to swagger.. Missing after refactor 2023-05-25 11:04:02 +02:00
Bjarke Berg
b5ed4ea43a Rename the security definition as this is only for users.. 2023-05-25 11:03:56 +02:00
Bjarke Berg
28712bd5cd Make new backoffice packable (#14286) 
* This moves around files and deletes the temp projects with files that are not moved to Core, Infrastructure etc.

Also moves the from new backoffice to static access, and override those with the old views in the legacy executeable

* Removes old files from the new executeable.

* Added missing files

* Added EF Core project to solution file

* fix build
 2023-05-25 10:38:44 +02:00
Kenn Jacobsen
5ae984aca6 Empty filter and sort values should not be considered when executing queries (#14295) 2023-05-24 13:22:27 +02:00
Kenn Jacobsen
714cf374f0 Management API: Property editor temporary file handling (#14244) 
* Use new temporary files handling for property editors

* Add compat suppressions

* Add missing compat suppressions

* Don't discard valid file upload values

* Rename cuid and puid to contentKey and propertyTypeKey

* Update src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Fetch user async + remove unnecessary dependency

---------

Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
 2023-05-24 12:31:19 +02:00
Kenn Jacobsen
3cadd35d40 Start-item support in RTE markup (#14283) 
* Append start item to RTE markup

* Split the Examine specifics from API query service (#14257)

* Split the Examine specifics from API query service to a provider based model

* Review changes: Use paged model as provider return value + add logging

* Fix version

* Revert incidentally changed version number by targeting wrong branch

* Fix wrongly changed version number --- it's RC2 now

---------

Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-05-24 08:02:42 +02:00
Jacob Overgaard
fc0e2cbf00 update backoffice submodule 2023-05-23 13:08:56 +02:00
Bjarke Berg
b4e7d55e4d Align versions 2023-05-23 12:29:56 +02:00
Bjarke Berg
8f5f7f72fa Merge remote-tracking branch 'origin/v12/dev' into v13/dev 
# Conflicts:
#	version.json
 2023-05-23 12:23:27 +02:00
Bjarke Berg
c878567633 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-05-23 12:17:40 +02:00
Bjarke Berg
86f867479b Merge branch 'release/12.0' into v12/dev 
# Conflicts:
#	version.json
 2023-05-23 12:16:32 +02:00
Bjarke Berg
7e1620cbc3 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-05-23 12:15:39 +02:00
Andy Butland
e79246368b Update JSON schema package references for Forms and Deploy. (#14285) 2023-05-23 09:38:01 +02:00
Nikolaj
7776cded73 Bump version to next RC 2023-05-22 15:19:13 +02:00
Nikolaj
54af079d97 Fix version 2023-05-22 15:18:14 +02:00
Nikolaj
dee01e950c Merge branch 'release/12.0' into v12/dev 2023-05-22 15:17:25 +02:00
Sebastiaan Janssen
b67c7fbe77 Cherry pick b8d6613bd8 accidentally kept both lines instead of just the one, this fixes the problem. 2023-05-22 15:15:19 +02:00
Jacob Overgaard
38aacfc30a update backoffice submodule 2023-05-22 13:27:56 +02:00
Nikolaj Geisle
459d664531 V12: Map |DataDirectory| to path in connectionString (#14278) 
* Add Data directory as constants

* Use new constants instead of internal ones

* Replace data directory in connection string if its there

* Update src/Umbraco.Cms.Persistence.EFCore/Extensions/UmbracoEFCoreServiceCollectionExtensions.cs

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2023-05-22 12:44:52 +02:00
Mole
1e6c220610 Downgrade OpenIdDict (#14279) 2023-05-22 12:29:16 +02:00
Kenn Jacobsen
8bbca79e55 Split the Examine specifics from API query service (#14257) 
* Split the Examine specifics from API query service to a provider based model

* Review changes: Use paged model as provider return value + add logging
 2023-05-22 11:06:22 +02:00
Dhanesh Kumar Mj
7d3c22b28a [Fix] Block editor labels showing Angular JS on first load. (#14143) 
Co-authored-by: Dhanesh Kumar <“dhanesh.kumar@phases.io”>
(cherry picked from commit 58695b6e9f)
 2023-05-19 11:27:01 +02:00
Dhanesh Kumar Mj
16f448a802 [Fix] Block editor labels showing Angular JS on first load. (#14143) 
Co-authored-by: Dhanesh Kumar <“dhanesh.kumar@phases.io”>
(cherry picked from commit 58695b6e9f)
 2023-05-19 11:25:15 +02:00
Nikolaj
867a8a4066 Bump version to next RC 2023-05-17 13:25:08 +02:00
Jacob Overgaard
c5f1af8adc update backoffice submodule 2023-05-17 11:11:37 +02:00
Bjarke Berg
a4202f352a Ignore macros completely in deliveryapi (#14262) 
* Hack a fix for MNTP that saves content in configuration instead of document

* Ignore macro parsing in delivery api, instead of exploding
 2023-05-17 11:03:27 +02:00
Kenn Jacobsen
c5e524c9b9 Wrap RTE content in a dedicated model for future expansion (#14258) 2023-05-16 19:08:38 +02:00
Bjarke Berg
c632908a51 Re-added the postmigration from the migration context (#14255) 
* Re-added the postmigration from the migration context

* Minor cleanup

* Add executed migration contexts to the result object

---------

Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
 2023-05-16 14:28:30 +02:00
Nikolaj Geisle
0548266d0f Check folder exist before trying to delete (#14249) 
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-05-15 16:09:36 +02:00
Bjarke Berg
27e5b55e05 Added OpenIddict dependencies for future usage (#14247) 2023-05-15 13:24:19 +02:00
Nikolaj
e50a3d1340 Trust Test DB certificate 2023-05-15 12:43:13 +02:00
Nikolaj
79ae829ac7 Set version to rc1 2023-05-15 10:55:43 +02:00
Elitsa Marinovska
e572dcfa2d Delivery API: Handle more unhappy paths when querying (#14245) 
* Handle more unhappy paths

* Review comments

---------

Co-authored-by: kjac <kja@umbraco.dk>
 2023-05-15 10:46:29 +02:00
Kenn Jacobsen
b32b8c2265 Un-routable content should never be accessible in the delivery API (#14242) 2023-05-15 10:27:20 +02:00
Kenn Jacobsen
85d46c3e82 Merge local and global crops for MediaPicker3 (#14237) 2023-05-15 10:06:24 +02:00
Andreas Zerbst
ac0f76f162 Changed so we are checking if the FolderExits (#14196) 2023-05-15 09:05:22 +02:00
Bjarke Berg
f2def5307c Fix build 2023-05-15 09:02:53 +02:00
Bjarke Berg
979e023d73 Merge remote-tracking branch 'origin/v12/dev' into v13/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorAdvanced.spec.ts
 2023-05-15 08:51:50 +02:00
Kenn Jacobsen
368e9f2f59 Fix delivery API cache level for media picker property editors (#14238) 2023-05-15 08:49:01 +02:00
karlmacklin
b3bedb4efe XPath can unambiguously use $site/$parent (#14127) 
* XPath can unambiguously use $site/$parent

* add deprecation notices and obsolete methods

* Update deprecation description text/instruction

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Small spelling fix on deprecation description

* keep depr. getByQuery and handle legacy usage

---------

Co-authored-by: Kalle Macklin <karlmacklin@users.noreply.github.co>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2023-05-15 08:48:36 +02:00
Andreas Zerbst
401fa7334b Fixed: an block grid editor accceptance test on the pipeline for v12 (#14240) 
* The attribute we asserted on has been changed which failed our test. The test is updated to match with the correct url

* Updated so we use encodeURI instead of replacing the values in the path
 2023-05-15 08:04:16 +02:00
Bjarke Berg
5df655d599 Unbreak breaking change 2023-05-15 07:58:43 +02:00
Bjarke Berg
d48a8d7c75 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	src/Umbraco.Cms.ManagementApi/ViewModels/Installer/InstallViewModel.cs
 2023-05-15 07:57:45 +02:00