Commit Graph

13335 Commits

Author SHA1 Message Date
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
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
Bjarne Fyrstenborg
425023f83b Ensure datepicker input is cleared (#15338) 2024-01-05 15:23:57 +00: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
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
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
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
Jacob Overgaard
6f123224de V13: Regression with global window.uui export (#15412)
* revert change to load commonjs version of uui

* revert to load uui

* build login first

* build login assets as iife to support loading inside the backoffice
2023-12-12 12:03:49 +01:00
Bjarke Berg
bab22d8b5f Merge remote-tracking branch 'origin/release/12.3.4' into release/13.0
# Conflicts:
#	version.json
2023-12-11 14:39:32 +01:00
Bjarke Berg
9f375ede65 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-11 14:37:36 +01:00
Nikolaj Geisle
237e4e56b2 Merge pull request from GHSA-v98m-398x-269r
Co-authored-by: kjac <kja@umbraco.dk>
2023-12-11 14:00:23 +01:00
Nikolaj Geisle
3331788c5c 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-11 13:59:35 +01:00
Sebastiaan Janssen
422218ea15 Merge branch 'v13/dev' into contrib 2023-12-08 15:54:34 +01:00
Sebastiaan Janssen
6f582451ed Merge branch 'release/13.0' into v13/dev
# Conflicts:
#	version.json
2023-12-08 15:54:06 +01:00
Bjarke Berg
cf2ec50d15 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev
# Conflicts:
#	version.json
2023-12-08 13:34:41 +01:00
Bjarne Fyrstenborg
87b8023f2c Fix typo in dictionary (#15380) 2023-12-07 17:51:28 +00:00
Nikolaj Geisle
4b5bbbd531 Change webhook-> logs to Deliveries 2023-12-07 15:23:21 +01:00
Nikolaj Geisle
b50353b238 V13: Log webhook firing exceptions when they happen (#15393)
* Refactor Webhook logging to handle exceptions

* Add Exception occured property to WebhookLog.
2023-12-07 14:25:26 +01:00
Nikolaj Geisle
d31bb14f57 Link to log on exception/error (#15391) 2023-12-07 12:11:38 +01:00
Bjarke Berg
1a93dae0c4 Ensure the toggles return booleans and not integers. (#15354) 2023-12-07 11:25:31 +01:00
Bjarne Fyrstenborg
b97564ba3a Fix console errors in content type editor with single block mode 2023-12-06 14:15:15 +01:00
Sebastiaan Janssen
024a57e098 Merge branch '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/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/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs

(cherry picked from commit ef3f2c48198d8baed9d3340f926cd07e80720428)
2023-12-06 12:47:51 +01:00
Richard Ockerby
17eda54bfb Don't overwrite default values in the block list editor if they don't exist in the data model (for new creations) 2023-12-05 21:22:45 +01:00
Sebastiaan Janssen
319d98ef23 Merge branch 'v12/dev' into contrib 2023-12-05 12:36:34 +01:00
Bjarne Fyrstenborg
c6d01178c0 Update z-index of block actions (#15329) 2023-12-01 13:51:42 +00:00
Bjarne Fyrstenborg
da6aaa07db Don't change format in convertToLocalMomentTime (#15223)
(cherry picked from commit 963e57723a)
2023-12-01 10:03:23 +01:00
Bjarne Fyrstenborg
8c23075ec5 Adjust content type picker to support different content types (#15080) 2023-11-30 19:38:56 +01:00
Bjarne Fyrstenborg
86d98658f1 Make Block List configuration consistent with Block Grid (#15087) 2023-11-30 19:29:06 +01:00
Søren Mastrup
e947daff45 Added password toggle to Umbraco installer form 2023-11-30 19:27:55 +01:00
Bjarne Fyrstenborg
ee8339d563 Add contentTypeEditor to editorService (#15034) 2023-11-30 19:25:03 +01:00
Jan Skovgaard
7e26d09f77 Bugfix: #14481 - Landmark roles missing (#14980) 2023-11-30 19:21:48 +01:00
Erik-Jan Westendorp
feaac58027 localization for webhooks (#15191) 2023-11-30 16:05:38 +01:00
Warren Buckley
d088ed8bf6 V13: Webhook all the things (#15161) 2023-11-30 15:41:45 +01:00
Kenn Jacobsen
528b7d346a Rollback some #14816 changes to fix 2FA (#15317) 2023-11-30 11:32:49 +01:00
Jannik Anker
6b599b641c Prevent RTE in fullscreen being partially covered by the left menu column (should fix #14890) (#15002)
* Should fix #14890

* Set z-index of #leftcolumn to 0 when Tiny MCE is in fullscreen mode

---------

Co-authored-by: Jannik Anker <jaa@kfforsikring.dk>
Co-authored-by: Jason Elkin <jason@bumpdigital.co.uk>
2023-11-29 14:59:20 +01:00
leekelleher
b74aadff97 Block editors - replaces hardcoded -20 with current node ID 2023-11-29 14:40:37 +01:00
Bjarke Berg
1f527fefd8 Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.Integration/CompatibilitySuppressions.xml
2023-11-28 11:20:02 +01:00
Bjarke Berg
1176f04caf Updated pacakge-lock files 2023-11-28 09:45:07 +01:00
Bjarke Berg
280518c9d6 Merge remote-tracking branch 'origin/v11/dev' into v12/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
#	src/Umbraco.Web.UI.Client/.nvmrc
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
2023-11-28 09:39:31 +01:00
Bjarke Berg
ab781560bc Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
2023-11-27 19:47:24 +01:00
Zeegaan
be443189e1 Merge branch 'v13/dev' into release/13.0
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/webhooks/overlays/details.html
2023-11-27 08:26:41 +01:00
Bjarne Fyrstenborg
58e693a75d Fix typo in umbImageGravity 2023-11-22 21:53:24 +00:00
Bjarke Berg
1c2602f57c Dynamic root with culture and segment (#15287)
* parse culture and segment for dynamic root.

* Handle new culture and segment parameters

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2023-11-22 19:58:06 +01:00
Nikolaj Geisle
bcd386ac70 V13: Fix missing contenttype in webhook (#15282)
* Create missing node for content type

* Change to Unknown instead of deleted

* Cleared contentTypes and removed console.log

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Andreas Zerbst <andr317c@live.dk>
2023-11-22 13:54:11 +01:00
Nikolaj Geisle
4c3b4752db V13: Change WebhookLog status for clarity (#15247)
* Refactor to show icon and status code to make status more clear

* Fix up migration

* Add change log status migration

* Fix up frontend to display cross when fail

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
2023-11-21 13:55:52 +01:00
Bjarne Fyrstenborg
3ff6bd191a V13: Webhook logs formatting (#15246)
* Use code snippet component for request and response

* Change overlay size to medium

* Format log date

* Handle JS as JavaScript

* Try format JSON

* Update less syntax

* Add word wrap

* Formatting

* Update variable

* Remove unused editorService

* Add missing details controller and fix formatting in catch block

* Set data object

* Update overlay size to match umb-editor overlay

* Use editorService instead to show details on overlay

* Add general box header

(cherry picked from commit 13db9b308e)
2023-11-21 09:30:02 +01:00
Bjarne Fyrstenborg
13db9b308e V13: Webhook logs formatting (#15246)
* Use code snippet component for request and response

* Change overlay size to medium

* Format log date

* Handle JS as JavaScript

* Try format JSON

* Update less syntax

* Add word wrap

* Formatting

* Update variable

* Remove unused editorService

* Add missing details controller and fix formatting in catch block

* Set data object

* Update overlay size to match umb-editor overlay

* Use editorService instead to show details on overlay

* Add general box header
2023-11-21 09:24:48 +01:00