Commit Graph

42481 Commits

Author SHA1 Message Date
Sebastiaan Janssen
60765b976c Merge branch 'v11/dev' into v11/contrib
# Conflicts:
#	.gitignore
#	src/Umbraco.Cms.ManagementApi/ManagementApiComposer.cs
#	src/Umbraco.Cms.ManagementApi/OpenApi.json
2022-11-17 09:26:44 +01:00
Niels Lyngsø
9b13a260e9 Block Grid Editor: Removal of the forced placement feature (#13400)
* removal of the forceLeft/forceRight code

* removal of forced placement in css

* bring back removed code
2022-11-17 08:41:21 +01:00
Warren Buckley
137b4eba68 Merge pull request #13421 from umbraco/v11/codespace-fwd-port-smtp4dev
Codespaces: List port 5000 for Smtp4Dev
2022-11-16 16:34:59 +00:00
Warren Buckley
dbc8c2680e List port 5000 for Smtp4Dev 2022-11-16 16:21:05 +00:00
Jacob Overgaard
f2de42f38e v11: Fix for TinyMCE dropdowns (#13417)
* Set higher z-index for TinyMCE overlays as they were set below that of our property editor overlays

Fixes #13414

* replace !important with more specificity
2022-11-16 11:48:18 +01:00
Warren Buckley
079d2f91b9 Merge pull request #13416 from umbraco/v11/codespaces-auto-open-codespace-readme
CodeSpaces: Scaffold out a file for a specific Codespace readme to auto open
2022-11-15 16:58:12 +00:00
Warren Buckley
d3905b4c5c Scaffold out a file for a specific Codespace readme 2022-11-15 16:16:08 +00:00
Jacob Overgaard
7af8a407d3 Management API operation IDs (#13374)
* add a custom operationId generator to swagger operations based on the name of the action

* mark 'total' and 'items' as required in all paged models seeing as they should be there always non-nullable

* fix action typo collect -> rebuild to avoid duplicates

* fix operations for server status + version

* add factory to format custom operation ids

* Revert "fix operations for server status + version"

This reverts commit 066a59e1c282e055f25ccb13437040d7ec9e5c62.

* Throw exception if no relative path and remove template placeholders completely

* Revert "Throw exception if no relative path and remove template placeholders completely"

This reverts commit 40af0721d6cfcd021326d6c2c54fbead7df53e7c.

* Move source generated regex statements to its own file (#13410)

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-11-15 15:43:12 +01:00
Warren Buckley
be8b083746 Merge pull request #13409 from umbraco/v11/codespace-sqlite-extension
Codespaces: Adds SQLite extension & ensures SQLite thats needed for it
2022-11-15 14:01:51 +00:00
Warren Buckley
2f976b41b4 Adds SQLite extension & ensures SQLite thats needed for it 2022-11-15 13:33:26 +00:00
Warren Buckley
c7e78bcb72 Merge pull request #13407 from umbraco/v11/codespace-remove-build-before-launch
Codespaces: Removes the explicit build before attaching debugger launch task
2022-11-15 11:52:23 +00:00
Warren Buckley
704dda9575 Removes the explicit build before attaching debugger launch task 2022-11-15 11:23:53 +00:00
Warren Buckley
d4949ae613 Merge pull request #13405 from umbraco/v11/codespaces-prebuild-dev-cert
Codespaces: dotnet devcert in the docker was not working so moved to updateContentCommand
2022-11-15 10:47:53 +00:00
Warren Buckley
f0a34bd2a4 Merge branch 'v11/contrib' into v11/codespaces-prebuild-dev-cert 2022-11-15 10:19:39 +00:00
Warren Buckley
aaf76ec5b8 Merge pull request #13401 from umbraco/v11/feature/codespaces-port-forward-config
Enable CodeSpaces PortForwarding Config
2022-11-15 10:14:35 +00:00
Warren Buckley
1d78a06509 The devcert in the docker was not working so moved to updateContentCommand 2022-11-15 10:14:29 +00:00
Warren Buckley
b32b0371ae Open Browser config is not working for some unknown reason 2022-11-15 09:47:10 +00:00
Warren Buckley
0cad30a8fa Adds SMTP4Dev and opens browser to HTTPs Umbraco 2022-11-15 08:55:39 +00:00
Warren Buckley
5d3b2e2e8a Enable CodeSpaces PortForwarding Config as SMTP4Dev did not auto appear in new prebuilds 2022-11-15 08:43:21 +00:00
Warren Buckley
35355ce828 Merge pull request #13398 from umbraco/v11/feature/codespace-prebuilds-take-two
Trying Codespace prebuilds to use updateContentCommand that the docs refer to
2022-11-14 15:14:52 +00:00
Warren Buckley
a4f8a51c57 Trying Codespace prebuilds to use updateContentCommand that the docs refer to 2022-11-14 15:11:15 +00:00
Jacob Overgaard
3a8024c0c6 v11: Rich text editor - remove distraction-free mode and optimise inline mode (#13394)
* combine 'inline' and 'distraction-free' modes with the quickbars plugin

* remove 'distraction-free' and map to 'inline'

* remove container overrides for 'distraction-free'
2022-11-14 16:01:01 +01:00
Warren Buckley
f5ff3e87d2 Merge pull request #13396 from umbraco/warrenbuckley-patch-1
Adds Open in GitHub Codespaces to main readme
2022-11-14 14:37:02 +00:00
Warren Buckley
cf96aefb86 Adds Open in GitHub Codespaces to main readme
Adds Open in GitHub Codespaces to main readme next to other badges we have at the top of the readme
2022-11-14 14:36:26 +00:00
Warren Buckley
dd895b1736 Merge pull request #13395 from umbraco/v11/feature/codespaces-prebuild-dotnetbuild
Adds dotnet build command for onCreateCommand to use in Prebuilds of CodeSpaces
2022-11-14 14:31:56 +00:00
Warren Buckley
3c709cfa24 Adds dotnet build command for onCreateCommand to use in Prebuilds of CodeSpaces 2022-11-14 14:10:52 +00:00
Nikolaj
d03e0443b1 Merge branch 'release/11.0' into v11/dev
# Conflicts:
#	version.json
2022-11-14 14:41:44 +01:00
Nikolaj
0356aade30 Bump version 2022-11-14 12:44:26 +01:00
Nikolai Emil Damm
c2047d1d6e Remove nullability from AdditionalData on ContentItemDisplay (#13380)
@Zeegaan We have a use case where we need to set a value in the AdditionalData dictionary in a NotificationHandler, but as it can be null, it requires reflection to make sure that is not the case. As such, it would be nice if the following change could be implemented to ensure it is never null.
2022-11-14 12:42:43 +01:00
Bjarke Berg
13308c3610 Obsolete old migrations and exif code (#13382)
* Obsoleted and deleted internal migrations + Enabled breaking changes checks agains v11.0.0-rc1

* Obsoleted and deleted internal exif stuff

* Added CompatibilitySuppressions.xml

* Change GenerateCompatibilitySuppressionFile
2022-11-14 12:40:22 +01:00
Bjarke Berg
616d092577 Obsolete old migrations and exif code (#13382)
* Obsoleted and deleted internal migrations + Enabled breaking changes checks agains v11.0.0-rc1

* Obsoleted and deleted internal exif stuff

* Added CompatibilitySuppressions.xml

* Change GenerateCompatibilitySuppressionFile
2022-11-14 12:40:06 +01:00
Warren Buckley
888488e7e4 Merge pull request #13392 from umbraco/v11/feature/codespace-gh-cli-ssh-support
Adds the SSH feature to allow the GitHub CLI SSH command to work
2022-11-14 11:34:27 +00:00
Mole
233c9df1d6 V11: InMemory - only add models assembly as runtime view reference if it exists (#13390)
* Only add models assembly as runtime view reference if it exists

* Add in memory metadata reference properly

compilations are readonly
2022-11-14 12:19:35 +01:00
Niels Lyngsø
e321982f44 remove console log 2022-11-14 12:19:31 +01:00
Niels Lyngsø
27ec62016d Block Grid Editor Improvements (#13282) 2022-11-14 12:19:24 +01:00
Niels Lyngsø
0e1095061e remove console log 2022-11-14 12:17:12 +01:00
Niels Lyngsø
1bd03374dc Block Grid Editor Improvements (#13282) 2022-11-14 12:17:03 +01:00
Mole
a9e605d532 V11: InMemory - only add models assembly as runtime view reference if it exists (#13390)
* Only add models assembly as runtime view reference if it exists

* Add in memory metadata reference properly

compilations are readonly
2022-11-14 11:37:55 +01:00
Warren Buckley
bd4553d8a4 Adds the SSH feature to allow the GitHub CLI SSH command to work 2022-11-14 10:01:34 +00:00
Matthew Care
77859719f2 Batch media upload (#12947)
* Allow simultaneous uploads

Upload files in batches for faster uploading

* Fix concurrency issue

Many requests to add files coming at the same time can cause duplicate folders to be created.
In some cases, SQL exceptions can throw, and cause the application to hang.
Add Semaphore to process files on a single thread.

* Replace Semaphore with a Scope Provider

As suggested in the PR comments, replaced Semaphore with ICoreScopeProvider

* Revert "Replace Semaphore with a Scope Provider"

This reverts commit 228e1010c61428c81f5162cb5e0dd2538357d816.

* Add comment to make configurable

Out of scope of the PR, but this should be configurable in appsettings

* Apply PR 13345

Apply PR 13345 to resolve "freezing" issue caused by unhandled errors

* Account for currently processing items

If you drag files into the dropzone whilst other files are uploading then the "total" count is incorrect.
2022-11-14 07:49:18 +01:00
Andreas Zerbst
bee6adfe27 V11: Add new blocklist acceptance tests (#13299)
* Created test for block list editor

* Added a couple of test for the block list editor

* Changed parts of builder

* Split the test into two files instead of one

* Updated and added test for blockListEditor

* Updated version

* Fixed so it now targets the correct selector

* Removed unnecessary login in the afterEach

* Fixed up the test so they are now using constants and the correct helpers

* Bumped version

* Updated the package-lock

* Added local function to battle code reuse!

* Updated the path of the image for the test 'can edit a block list editor'

* Placed an expect before the button so it waits to click the button till it's visible

* Yet another fix for the imagePath and a missing "
2022-11-14 07:01:33 +01:00
Warren Buckley
efa069f1ed Merge pull request #13387 from umbraco/v11/codespaces
Adds in .NET 7 SDK to GitHub CodeSpaces
2022-11-11 19:38:17 +00:00
Warren Buckley
4d1a1ba413 Adds in .NET SDK using the Feature approach in devcontainer.json until NET7 image is live 2022-11-11 19:01:54 +00:00
Nikolai Emil Damm
ad0582a5aa Remove nullability from AdditionalData on ContentItemDisplay (#13380)
@Zeegaan We have a use case where we need to set a value in the AdditionalData dictionary in a NotificationHandler, but as it can be null, it requires reflection to make sure that is not the case. As such, it would be nice if the following change could be implemented to ensure it is never null.
2022-11-10 14:13:10 +01:00
Kenn Jacobsen
69c6eae7a2 Move block grid single area rendering to its own dedicated view (#13359) 2022-11-09 09:52:46 +01:00
Kenn Jacobsen
d11ed8acff Move block grid single area rendering to its own dedicated view (#13359) 2022-11-09 09:51:11 +01:00
Bjarke Berg
84240d90b6 Updated to aspnetcore 7.0.0 (#13372) 2022-11-09 09:33:22 +01:00
Bjarke Berg
73afd29b55 Updated to aspnetcore 7.0.0 (#13372) 2022-11-09 09:30:07 +01:00
Mole
c1e9775f29 Merge new backoffice changes to release branch (#13368)
* New backoffice: Cleanup management API routes (#13296)

* Rename ModelsBuilderDashboard folder to ModelsBuilder

* Fix modelsbuilder paths and related naming

* Rename analytics route to telemetry

* Fix controller bases - routes and tags

* Fix items route

* Fix more controllerbase routes

* Fix route

* Fix OpenApi file

* Merging DictionaryItem and Dictionary

* Fix TrackedReferences naming

* Update OpenApi file

* Rename Analytics* related types to Telemetry*

* New Backoffice: Return AnalyticsLevelViewModel from Telemetry/ (#13298)

* Return TelemetryLevelViewModel instead of TelemetryLevel

* Fix schema

* Change telemetry/current to telemetry/level

(cherry picked from commit f2b8494c669cbbf04b623753abbf1be211973aa9)

* Add contants for tree and recycle-bin subpaths

(cherry picked from commit 4449f56bc00832ea6d357a3854b454791c80e0e2)

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

* OpenId Connect authentication for new management API (#13318)

* First attempt at OpenIddict

* Making headway and more TODOs

* Redo current policies for multiple schemas + clean up auth controller

* Fix bad merge

* Clean up some more test code

* Fix spacing

* Include AddAuthentication() in OpenIddict addition

* A little more clean-up

* Move application creation to its own implementation + prepare for middleware to handle valid callback URL

* Enable refresh token flow

* Fix bad merge from v11/dev

* Support auth for Swagger and Postman in non-production environments + use default login screen for back-office logins

* Add workaround to client side login handling so the OAuth return URL is not corrupted before redirection

* Add temporary configuration handling for new backoffice

* Restructure the code somewhat, move singular responsibility from management API project

* Add recurring task for cleaning up old tokens in the DB

* Fix bad merge + make auth controller align with the new management API structure

* Explicitly handle the new management API path as a backoffice path (NOTE: this is potentially behaviorally breaking!)

* Redo handle the new management API requests as backoffice requests, this time in a non-breaking way

* Add/update TODOs

* Revert duplication of current auth policies for OpenIddict (as it breaks everything for V11 without the new management APIs) and introduce a dedicated PoC policy setup for OpenIddict.

* Fix failing unit tests

* Update src/Umbraco.Cms.ManagementApi/Security/BackOfficeApplicationManager.cs

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

* Update src/Umbraco.Cms.ManagementApi/Security/BackOfficeApplicationManager.cs

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

* Update src/Umbraco.Cms.ManagementApi/Security/BackOfficeApplicationManager.cs

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

* Update src/Umbraco.Core/Routing/UmbracoRequestPaths.cs

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

* Use Swashbuckle instead of NSwag (#13350)

* First attempt at OpenIddict

* Making headway and more TODOs

* Redo current policies for multiple schemas + clean up auth controller

* Fix bad merge

* Clean up some more test code

* Fix spacing

* Include AddAuthentication() in OpenIddict addition

* A little more clean-up

* Move application creation to its own implementation + prepare for middleware to handle valid callback URL

* Enable refresh token flow

* Fix bad merge from v11/dev

* Support auth for Swagger and Postman in non-production environments + use default login screen for back-office logins

* Add workaround to client side login handling so the OAuth return URL is not corrupted before redirection

* Add temporary configuration handling for new backoffice

* Restructure the code somewhat, move singular responsibility from management API project

* Add recurring task for cleaning up old tokens in the DB

* Fix bad merge + make auth controller align with the new management API structure

* Explicitly handle the new management API path as a backoffice path (NOTE: this is potentially behaviorally breaking!)

* Redo handle the new management API requests as backoffice requests, this time in a non-breaking way

* Add/update TODOs

* Replace NSwag with Swashbuckle and clean up unnecessary client secret workaround

* Revert duplication of current auth policies for OpenIddict (as it breaks everything for V11 without the new management APIs) and introduce a dedicated PoC policy setup for OpenIddict.

* Fix failing unit tests

* A little niceness + export new OpenApi.json and fix path in contract unit test

* Redo after merge with v11/dev + filter out unwanted mime types

* Remove CreatedResult and NotFoundObjectResult where possible

* Custom schema IDs - no more "ViewModel" postfix and make generic lists look less clunky too

* A little more explanation for generic schema ID generation

* Force Swashbuckle to use enum string names

* Update OpenApi.json to match new enum string values

* Add clarifying comment about weird looking construct

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
2022-11-08 12:48:46 +01:00
Nathan Woulfe
65803e2645 add workflow to schema (#13349)
* add workflow to schema

* add licenses to CMSDefinition - intentionally only adding to schema, not registered as options
2022-11-08 11:07:30 +01:00