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

38783 Commits

Author SHA1 Message Date
Jacob Overgaard
f3ed935213 allow the blockeditormodelobject.service.js to fall back to -20 for currentPageId if we are not in an editor mode (#15615) 
we detect the editor mode by checking for `contentTypeKey` which only exists on content contexts
 2024-01-22 13:37:15 +01:00
Jacob Overgaard
9df6e65552 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-19 09:11:40 +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
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
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
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
Ronald Barendse
f705479767 Ensure artifact dependency keeps correct mode, ordering and checksum values (#15500) 2023-12-21 14:55:43 +01:00
Sven Geusens
812b414d96 Batched more update calls to avoid Sql paramater count error (#15487) 
Co-authored-by: Sven Geusens <sge@umbraco.dk>
 2023-12-21 09:43:37 +01:00
Bjarke Berg
851e060a25 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-12-20 15:13:06 +01:00
Bjarke Berg
28fc85a96c Merge remote-tracking branch 'origin/release/13.0' into v13/dev 
# Conflicts:
#	version.json
 2023-12-20 09:52:57 +01:00
Bjarke Berg
b1d9573e47 Merge remote-tracking branch 'origin/release/12.3' into v12/dev 
# Conflicts:
#	version.json
 2023-12-20 09:52:16 +01:00
Kenn Jacobsen
e8a81e30b1 Add policies for content template handling (#15482) 2023-12-19 14:22:09 +01:00
Kenn Jacobsen
e34b2c09e0 Add policies for content template handling (#15482) 2023-12-19 14:20:31 +01:00
Kenn Jacobsen
e04a41be45 Add policies for content template handling (#15482) 2023-12-19 14:18:48 +01:00
Sven Geusens
78850087f8 Added a temporary DataCollector for v14 editorAlias migrations (#15463) 
* Added a temporary DataCollector for v14 editorAlias migrations

* PR feedback

Do not run the collector on subscribers or non running instances
Reduced logger noise

* Extra v14 sanity check

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
 2023-12-19 14:18:10 +01:00
Chris Fitz-Avon
38f7df2b0c Remove content section access policy from GetAllLanguages endpoint. #15435 (#15450) 
(cherry picked from commit cedfdcc9b2)
 2023-12-18 08:27:01 +01:00
Chris Fitz-Avon
d5156aced2 Remove content section access policy from GetAllLanguages endpoint. #15435 (#15450) 
(cherry picked from commit cedfdcc9b2)
 2023-12-18 08:25:00 +01:00
Bjarke Berg
bf498b411c RebuildOnStartupHandler should not inject ExamineIndexRebuilder, but only the interface (#15465) 2023-12-18 06:58:12 +01:00
Nikolaj Geisle
8ecc5552ab Merge branch 'release/13.0' into v13/dev 
# Conflicts:
#	version.json
 2023-12-14 16:33:27 +01:00
Nikolaj Geisle
36b7b86384 Remove sections setting authorization policy (#15456) 2023-12-14 13:57:52 +01:00
Chris Fitz-Avon
cedfdcc9b2 Remove content section access policy from GetAllLanguages endpoint. #15435 (#15450) 2023-12-14 13:54:40 +01:00
Chris Fitz-Avon
c9feaa150e Remove content section access policy from GetAllLanguages endpoint. #15435 (#15450) 2023-12-14 13:49:46 +01:00
Nikolaj Geisle
c930b91ede 13: Add old databasemodel to ChangeLogStatusCode migration (#15454) 
* Add old model to migration and use that instead

* Remove new column
 2023-12-14 11:44:55 +01:00
Bjarke Berg
38879e11df Merge remote-tracking branch 'origin/release/13.0' into v13/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
#	version.json
 2023-12-13 10:44:10 +01:00
Bjarke Berg
8a9e6ee82d Merge remote-tracking branch 'origin/v12/dev' into v13/dev 
# Conflicts:
#	global.json
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html
#	src/Umbraco.Core/EmbeddedResources/Lang/da.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/fr.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
#	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/RecurringBackgroundJobHostedServiceRunner.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
#	src/Umbraco.Web.UI/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs
#	version.json
 2023-12-13 09:55:34 +01:00
Bjarke Berg
5a4aaae7f2 Merge remote-tracking branch 'origin/release/12.3' into v12/dev 
# Conflicts:
#	version.json
 2023-12-13 09:36:44 +01:00
Bjarke Berg
4e12f1e4e6 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-13 09:36:25 +01:00
Bjarke Berg
923c98a29f Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
 2023-12-13 09:31:54 +01:00
Bjarke Berg
9dfb3005bc fix build 2023-12-12 17:00:30 +01:00
Nikolaj Geisle
3720b5d930 Merge pull request from GHSA-v98m-398x-269r 
Co-authored-by: kjac <kja@umbraco.dk>
 2023-12-12 15:56:44 +01:00
Nikolaj Geisle
d0c5372c6b Merge pull request from GHSA-cfr5-7p54-4qg8 
* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-12 15:56:44 +01:00
Nikolaj Geisle
f7e4832898 Merge pull request from GHSA-8qp8-9rpw-j46c 
* Ensure that missing access rules do not break the site (#15081)

(cherry picked from commit 6777145079)

* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
 2023-12-12 15:56:31 +01:00