Commit Graph

12661 Commits

Author SHA1 Message Date
Mads Rasmussen
c1abcaabc1 add preview layer to prevent interaction with high z-index elements 2022-07-06 12:28:10 +02:00
Zeegaan
1993424264 Merge branch 'v10/dev' into v10/feature/variant-permissions 2022-07-04 14:43:09 +02:00
Bjarke Berg
3106e4ee1f Merge pull request #12585 from olibos/v10/olibos/fix/12575-external-login-form-action
Unescape returnPath.
2022-06-23 12:49:58 +02:00
Mads Rasmussen
16ae85f2db only render property editor readonly mode if the property editor supports it 2022-06-22 14:53:42 +02:00
Mads Rasmussen
1b19704d37 copy allowed actions in block list editor 2022-06-22 11:19:30 +02:00
Mads Rasmussen
37a4662e3c use readonly border in media picker 2022-06-22 11:19:02 +02:00
Mads Rasmussen
92fcc425e8 make readonly border lighter 2022-06-22 11:18:40 +02:00
Nikolaj Geisle
1ab472472c Fix redirect after logout bug https://github.com/umbraco/Umbraco-CMS/issues/12592 2022-06-21 08:50:00 +02:00
Zeegaan
0288e3d6a9 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/variant-permissions
# Conflicts:
#	src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Core/Models/ContentEditing/ContentVariationDisplay.cs
#	src/Umbraco.Core/Models/ContentEditing/UserGroupBasic.cs
#	src/Umbraco.Core/Models/ContentEditing/UserGroupSave.cs
#	src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
#	src/Umbraco.Core/Models/CultureImpact.cs
#	src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs
#	src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Core/Models/Membership/IReadOnlyUserGroup.cs
#	src/Umbraco.Core/Models/Membership/IUserGroup.cs
#	src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
#	src/Umbraco.Core/Models/Membership/UserGroup.cs
#	src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs
#	src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Dtos/UserGroupDto.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/UserGroupFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
2022-06-20 13:59:18 +02:00
Olivier Bossaer
88af609c81 Unescape returnPath. 2022-06-16 15:15:04 +02:00
Bjarke Berg
faf06be618 Changes to Basic Auth to support external logins (#12434)
* Fixed issues with basic auth middleware to support Umbraco Cloud usecase

* Fix redirects to return url, now allows website urls

* Strip potential domain part of returnPath

* Fix default value in appsettings schema

* Reintroduce check of basic auth enabled.

* Fix wrong negation introduced in #12349

* Fixed issues with redirects

* Also check external login cookie, while authenticating backoffice
2022-06-02 12:19:22 +02:00
Mads Rasmussen
971f0d7984 Feature: Configure Data Type conversion (#12374)
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2022-05-24 09:01:32 +02:00
Nikolaj Geisle
9a4daa451a v10: Set telemetry level in installer (#12365)
* Add slider to user view

* fix typo 'constentLevels'

* Add TelemetryLevel to UserModel

* Extend NewInstallStep to include descriptions of each TelemetryLevel

* Add nouislider as dependency for installer view

* Add telemetry levels

Add raw nouislider to select a telemetry level + set chosen level onChange to the user model + show detailed description of each level as a tooltip

* Copy over basic styling of nouislider

* Save consent level in installer

* Fix detailed key to not contain <br>

* Fix MetricsConsentService to log correctly when we set analyticsLevel in installer

* Fix breaking change and obsolete messages

* reinstate saved value of the subscription field if you traverse the steps

* calculate the initial slider level based on the saved value of the model

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
2022-05-19 15:49:08 +02:00
Paul Johnson
01d2d0326c Merge release/10.0.0 into v10/dev
commit e0aa430d4c
Author: Paul Johnson <pmj@umbraco.com>
Date:   Thu May 19 10:00:57 2022 +0100

    Fix typo in pipeline yaml

commit 2ec450f2d6
Author: Paul Johnson <pmj@umbraco.com>
Date:   Thu May 19 09:14:47 2022 +0100

    Fix yaml conditions

commit c2d548039a
Author: Paul Johnson <pmj@umbraco.com>
Date:   Thu May 19 09:02:50 2022 +0100

    Azure pipeline refactor (#12428)

    * Skip symbols for Umbraco.Templates

    * Resolve some test issues

    + Fixed whitespace dependant tests to pass regardless of build OS vs
    run OS.

    + Snap dictionary tests were failing when Configuration was release

    + Removed hardcoded baseUrl from one of the acceptance tests

    * Move docfx setup to ./build and fix

    * Update UI docs title

    * Added dockerfile that can be used when running the acceptance tests.

    * Take explicit dependency on System.Security.Cryptography.Pkcs

    * Refactor ci/cd pipeline

commit ee8359af75
Author: Mole <nikolajlauridsen@protonmail.ch>
Date:   Thu May 19 09:57:21 2022 +0200

    V10: Reintroduce appsettings-schema.json (#12416)

    * Reintroduce language files tests (#12367)

    * Reintroducing language files tests

    * Fix casing

    * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs

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

    * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj

    * Remove Umbraco.Templates from VerifyNuGet step

    * Remove duplicate and unnecessary properties

    * Generate json schema on build

    * Add targets file

    * Gitignore auto generated appsettings schema

    * Fix build not copying file

    * Use the new path in appsettings

    * Update copy message

    * Build json schema as release

    * Update json schema options

    Otherwise just running the project will put the file in the wrong place

    * Generate schema if it doesn't exist in Web.Ui

    * Update json schema options

    Otherwise just running the project will put the file in the wrong place

    Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
    Co-authored-by: Ronald Barendse <ronald@barend.se>

commit dd617ede80
Author: Ronald Barendse <ronald@barend.se>
Date:   Thu May 19 09:51:11 2022 +0200

    v10: Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj (#12413)

    * Reintroduce language files tests (#12367)

    * Reintroducing language files tests

    * Fix casing

    * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs

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

    * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj

    * Remove Umbraco.Templates from VerifyNuGet step

    * Remove duplicate and unnecessary properties

    Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
    Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

commit b83216876f
Author: Ronald Barendse <ronald@barend.se>
Date:   Thu May 19 08:36:04 2022 +0200

    v10: Project template database/connection string improvements (#12407)

    * Add new connection-string-provider-name parameter

    * Use template value forms to correctly encode JSON values

    * Add new development-database-type parameter

    * Update package template and fix App_Plugins directory rename

    * Remove conflicting short parameter name

    * Lowercase framework parameter to align with MS templates

    * Cleanup default template settings

    * Write unattended install parameters when either connection string or development database is set

    * Include RootNamespace in UmbracoPackage template

    * Update Umbraco specific gitignore rules

    * Revert "Lowercase framework parameter to align with MS templates"

    This reverts commit 22de389272a7e119df569ec2e54190265f6d0ae0.

    * Add exclude-gitignore parameter

    * Update template schemas

    * Add minimal-gitignore parameter

commit e40049dcf1
Author: Mole <nikolajlauridsen@protonmail.ch>
Date:   Wed May 18 15:22:51 2022 +0200

    Fix domain for invariant content nodes (#12405)

    Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>

commit a3692b887a
Author: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date:   Mon May 9 11:42:10 2022 +0200

    Use SnippetCollection to when working with snippets  (#12355)

    * Introducing a new Snippet type

    * Adding a SnippetCollection and SnippetCollectionBuilder

    * Using snippetCollection to get the snippets instead of fileService

    * Fixed fetching the correct content

    * Make ISnippet non-discoverable

    * Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection

    * Update CodeFileController to use the 2 snippet collections

    * Display the names with Empty.cshtml on top

    * Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection

    * Fix naming

    * Fix another naming

    * Cleanup + Use base items

    Co-authored-by: Bjarke Berg <mail@bergmania.dk>
    (cherry picked from commit 9326cc5fc6)

commit 4f48a4937b
Author: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date:   Fri Oct 8 11:18:00 2021 +0200

    Cherry picked from 4c08b44684

commit 4fdbfee597
Author: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date:   Wed May 11 00:51:37 2022 +0200

    Show nicer overlay when clicking block card for deleted element type (#12140)

    * Show nicer overlay when clicking block card for deleted element type

    * Cleanup

    * Remove stop-scrolling container

    * Use flex-start instead on start

    * Remove legacy flexbox fallback

    * Remove unnecessary hack

    * Use standard gap property instead

    * Localization of message

    * Fix translation

    * End sentence with a dot

    (cherry picked from commit ebb1dc21a9)

commit 3856bf8288
Author: Henk Jan Pluim <henkjan.pluim@greenchoice.nl>
Date:   Mon Apr 25 10:02:06 2022 +0200

    #fix 12254 return emptyresult

    (cherry picked from commit 7993d19c1b)

commit 7087c3d9f6
Author: Ronald Barendse <ronald@barend.se>
Date:   Tue May 17 12:59:01 2022 +0200

    v10: Use ForceCreateDatabase during unattended install and extend GetUmbracoConnectionString extension methods (#12397)

    * Add extension methods to get the Umbraco connection string/provider name from configuration

    * Added tests for configuration extension methods.

    * Fix issue with InstallMissingDatabase and ForceCreateDatabase

    * Fix comments

    * Revert casing change in GenerateConnectionString

    * Re-add AddOptions (without config binding) to fix test

    * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs

    Co-authored-by: Ronald Barendse <ronald@barend.se>

    * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs

    * Update src/Umbraco.Infrastructure/Runtime/RuntimeState.cs

    * Whitespace and documentation updates

    * Add DatabaseProviderMetadataExtensions

    * Filter before ordering

    * Replace DataDirectory placeholder when setting connection string

    Co-authored-by: Andy Butland <abutland73@gmail.com>
    Co-authored-by: Bjarke Berg <mail@bergmania.dk>
    (cherry picked from commit 8e6e262c7f)

commit e90bf26577
Author: Ronald Barendse <ronald@barend.se>
Date:   Tue May 17 07:33:54 2022 +0200

    v10: Support System.Data.SqlClient provider name (#12408)

    * Add support for System.Data.SqlClient provider name

    * Only update connection string when required

    (cherry picked from commit e82bcb1b76)

commit fd0637c96d
Author: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date:   Mon May 16 14:23:59 2022 +0200

    Reintroduce language files tests (#12367)

    * Reintroducing language files tests

    * Fix casing

    * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs

    Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
    (cherry picked from commit 2ed71a64ec)
2022-05-19 10:25:44 +01:00
Mads Rasmussen
9e51ad9cbf check for permissions in block list editor 2022-05-16 13:44:19 +02:00
Mads Rasmussen
3f0b90b18d remove delete row button when block list editor is readonly 2022-05-16 13:05:46 +02:00
Mads Rasmussen
c0f674d333 localize unlock invariant property help text 2022-05-16 12:32:40 +02:00
Mads Rasmussen
6c4159751c add translation for shared 2022-05-16 11:39:14 +02:00
Mads Rasmussen
23b8dd843c add more white space underneath language label 2022-05-16 11:35:07 +02:00
Mads Rasmussen
ec60ad8629 remove padding from property unlock container 2022-05-16 11:32:33 +02:00
Mads Rasmussen
121933a9ed only use preview mode if the user can also unlock the property editor 2022-05-16 11:29:33 +02:00
Mads Rasmussen
3b8c5dd084 Add check for editing invariant properties based on the appsetting config 2022-05-16 11:07:09 +02:00
Mads Rasmussen
2ad51a4520 update to variable 2022-05-12 21:56:35 +02:00
Mads Rasmussen
5494b48756 allow unlocking invariant properties if a user has update permissions for the language 2022-05-12 21:54:04 +02:00
Mads Rasmussen
ce8a635c2c always show shared badge on invariant properties on variant nodes 2022-05-12 18:49:54 +02:00
Mads Rasmussen
e02516193a Merge branch 'v10/feature/variant-permissions' into v10/feature/editable-invariant-properties-ui 2022-05-12 18:33:02 +02:00
Mads Rasmussen
ec91d8c22b check for publish permission when publishing with decendants 2022-05-12 18:07:35 +02:00
Mads Rasmussen
87811bd3b3 check for unpublish permission 2022-05-12 18:07:00 +02:00
Mads Rasmussen
dae338b4e8 check for schedule permission 2022-05-12 18:06:41 +02:00
Mads Rasmussen
7405cbe6ef check for send to publish permission 2022-05-12 18:05:38 +02:00
Mads Rasmussen
c26a0a46b0 dont allow publish if the user doesn't have publish permissions 2022-05-12 18:02:15 +02:00
Mads Rasmussen
84108bbea2 dont allow save if the user doesn't have save permissions 2022-05-12 18:01:17 +02:00
Mads Rasmussen
6ddce4b151 use correct magic letter for update permission 2022-05-11 20:30:08 +02:00
Mads Rasmussen
c9c00760b5 match tag editor readonly styling with input 2022-05-11 20:25:34 +02:00
Mads Rasmussen
5e4ecf2462 set node name to readonly when the user has no update permissions 2022-05-11 20:22:47 +02:00
Mads Rasmussen
4a63433257 simplify check for readonly 2022-05-11 20:21:49 +02:00
Mads Rasmussen
de8a5bc855 style readonly inputs different than disabled inputs 2022-05-11 19:36:39 +02:00
Mads Rasmussen
95a41afea9 list view: check for readonly based on variant permissions 2022-05-11 19:26:54 +02:00
Mads Rasmussen
16288cf939 content: check for readonly properties based on variant permissions 2022-05-11 19:26:24 +02:00
Mads Rasmussen
20c3799e5b add overlay to allow editing invariant properties from all languages 2022-05-10 16:12:58 +02:00
Nikolaj Geisle
0d16de1b64 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/variant-permissions 2022-05-10 15:34:46 +02:00
Mads Rasmussen
23bb172be0 add icon for languages 2022-05-10 13:10:23 +02:00
Mads Rasmussen
4dd4f190e3 Move languages underneath sections 2022-05-10 12:40:03 +02:00
Mads Rasmussen
58a915d2f7 wire up remove language 2022-05-10 12:16:32 +02:00
Mads Rasmussen
2e100e60c4 read from languages - save to allowedLanguages 2022-05-10 11:39:39 +02:00
Mads Rasmussen
b75752e9a6 post array of language id's when saving 2022-05-09 15:38:40 +02:00
Mads Rasmussen
a0eeb6da26 save to allowedLanguages 2022-05-09 14:31:02 +02:00
Mads Rasmussen
98de8499e0 read from allowedLanguages 2022-05-09 14:30:46 +02:00
Mads Rasmussen
f095797c2e Merge branch 'v10/feature/readonly-property-editors' into v10/feature/variant-permissions 2022-05-09 11:20:28 +02:00
Mads Rasmussen
4ba094ff75 Merge branch 'v10/dev' into v10/feature/variant-permissions 2022-05-09 11:08:04 +02:00