Commit Graph

40849 Commits

Author SHA1 Message Date
Erik-Jan Westendorp
4cd0544c65 Create an extension methods to easily append to CollectionBuilders (#11691)
* Create UmbracoBuilder.ContentApps.cs

Add an extension method to register content apps to make it possible to register content apps in the startup.cs class.

* Create UmbracoBuilder.CollectionsBuilders

* White space

* Rename OEmbedProvider to EmbedProvider

* Rename EmbedProvider to OEmbedProvider
2021-11-26 10:18:45 +01:00
Paul Johnson
6a2a5d7fc9 Bugfixes for MNTP / EntityController (#11685)
* Added EntityController.GetUrlsByIds support for int & guid + update MNTP

Fixes issue with MNTP (for 8.18) in a partial view macro - GH #11631

Renamed GetUrlsByUdis to match, don't do this in v9 as it would be
breaking there, instead mark it obsolete.

TODO: v9 ensure integration test coverage, more painful here as no
WebApplicationFactory.

* Added partial test coverage for GetUrlsByIds.

This doesn't actually work in the backoffice because of GH #11448

So lets fix that next.

* Failing test demonstrating #11448

* Fix for #11448 getByIds doesn't work as expected.

ParameterSwapControllerActionSelectorAttribute - cached body survived between requests.

* Expand on sync vs async comment for future confused souls.

* Might aswell cache parsed json vs string for performance

* Make ParameterSwapControllerActionSelector remarks more accurate.

* Share deserialized request body between action constraint and model binder

* Be more defensive with RequestBodyAsJObject HttpContext item

Only store if deserialize success.
Don't assume key being present means can cast as JObject.

* Nest constant a little deeper.

* Final defensive tweak
2021-11-25 13:47:59 +01:00
Nikolaj Geisle
a0695850cb Merge pull request #11587 from umbraco/v8/bugfix/membership-contentapp
Move member properties to Member Content App
2021-11-24 10:45:53 +01:00
Nikolaj Geisle
b5a895e269 Merge pull request #11349 from umbraco/v9/feature/update-imagesharp-web
Update to SixLabors.ImageSharp.Web 1.0.4 and remove processing order workarounds
2021-11-24 10:24:23 +01:00
Nikolaj Geisle
004d3410e9 Merge pull request #11359 from umbraco/v9/feature/imagesharp-cachecontrol-immutable
Change Cache-Control header when cache buster value is present
2021-11-24 09:48:51 +01:00
Nikolaj Geisle
c19463b8ae Revert changes in Umbraco.Web.Common.csproj 2021-11-24 09:22:47 +01:00
Nikolaj Geisle
e0701ccd48 Merge branch 'v9/dev' into v9/feature/update-imagesharp-web
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
#	src/Umbraco.Web.UI/umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts
2021-11-24 09:11:52 +01:00
inetzo
7538f0c4ad Apply pickDate-config setting to hide calendar in datepicker (#11632)
* Apply pickDate-config setting to hide calendar in datepicker 

A time-only picker is only possible if the format is configured like "hh:mm:ss". By using the pickDate config it is possible to determine whether the calendar should be shown or not, instead of depending on a certain time format.

* Changed timeformat to accept both hh:mm:ss and hh:mm

Edited the regex to math times with and without seconds. The calendar should not be shown anymore if the timeformat is (H)H:mm:ss or (H)H:mm.

* Removed unused config property pickDate

config.pickDate is never used and can be removed.

* remove pickDate config from datepickers config
2021-11-24 02:07:35 +01:00
Paul Johnson
13a51d3267 Support import/export for doc type history cleanup policy (#11660)
* Support import/export for doc type history cleanup policy

* Support unset/null history cleanup value

* Resolve issue when api endpoints called without cleanup policy.
noop isn't good enough as map fails for response.

* null conditional vs null coalesce assignment

* Don't overwrite existing policy if omitted in import XML

* Update history cleanup warning and translations

* Change history cleanup alert to infomational styling

* Remove margin around history cleanup config

Co-authored-by: Ronald Barendse <ronald@barend.se>
2021-11-23 18:53:29 +00:00
Rasmus Söderström
f7be5a5dec Add functionality for resetting to the initial state. (#11593)
* Add functionality for resetting to the initial state.

* Refactoing initData
2021-11-23 03:02:32 +01:00
Jan Skovgaard
16c1359a90 Focus lock improvements (#11435)
* Call onInit directly and add a timeout of 500ms

* Don't include hidden input types in the selector

* Ensure that the "next" focusable element is selected in case the first element is either the sub-nav or the ellipsis type

* Make sure tab is not selected first
2021-11-23 01:41:51 +01:00
Bjarke Berg
351c37abc0 Merge remote-tracking branch 'remotes/origin/v8/dev' into v9/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/ContentVersionMeta.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
#	src/Umbraco.Core/Services/Implement/ContentService.cs
#	src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
#	src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
#	src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Cache/DistributedCacheBinder.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
2021-11-22 18:53:38 +01:00
Bjarke Berg
33f00a508f V9/feature/merge v8 22/11/2021 (#11681)
* Changes to GetReducedEventList (#11444)

* Instead of only using first event, we combine events of same type into a single event with multiple arguments

* Added generic method to DRY up grouping logic.

* Renamed method to better reflect new functionality.

Co-authored-by: Andy Butland <abutland73@gmail.com>

* Merge pull request #11360 from umbraco/v8/bugfix/11057-mandatory-image-not-validating-after-first-time-failure

Fixes 11057: Mandatory Image not validating after first time failure

(cherry picked from commit 5cc70d2160)

* Additional optional sanitization of scripting in TinyMCE (#10653)

(cherry picked from commit f68dba7bcb)

* Bump version to 8.17.1

* Hide localization key while loading

* ContentVersion cleanup backoffice UI (#11637)

* init rollback ui prototype

* add busy state to button, deselect version, add pagination status

* add localisation

* style current version

* disable rollback button when nothing is selected

* stop click event

* Endpoints for paginated content versions.
Light on tests, tight on time.

* Endpoints to "pin" content versions

* camel case json output.
Not sure why json formatter not set for controller, bit risky to add it now

* wire up paging

* wire up pin/unpin

* rename getPagedRollbackVersions to getPagedContentVersions

* prevent selection of current version and current draft

* add current draft and current version to UI

* remove pointer if the row is not selectable

* Improve warning for globally disabled cleanup feature.

* Fix current loses prevent cleanup state on publish.

* Added umbracoLog audit entries for "pin" / "unpin"

* Match v9 defaults for keepVersions settings

* Fix - losing preventCleanup on save current with content changes

* update pin/unpin button labels

* fix pagination bug

* add missing "

* always send culture when a doc type can vary

Co-authored-by: Mads Rasmussen <madsr@hey.com>

* Bugfix - DocumentVersionRepository.Get should not join culture variation

* Bugfix - Missing write lock

* Bugfix - Policy returns items to delete not items to keep.
Switch to inverse behavior.

Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Paul Johnson <pmj@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
2021-11-22 18:50:10 +01:00
Bjarke Berg
579613c83c Revert version 2021-11-22 17:45:49 +01:00
Bjarke Berg
104819084a Merge remote-tracking branch 'origin/v9/9.1' into v9/dev 2021-11-22 17:42:47 +01:00
Paul Johnson
b58a0cf0a5 Ensure Umbraco static assets included when publish --no-build (#11665)
* Ensure Umbraco static assets included when publish --no-build

Closes #11662

* Bump version to 9.1.1
2021-11-22 09:30:54 +01:00
Bjarne Fyrstenborg
c2e9ccea9f Member group picker actions (#10096)
* Add remove all property action

* Disable action if no current ids or new ids

* Use vm

* resolve conflict

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-11-22 12:38:42 +10:00
Mole
e56c1cc208 Fix the introduction tour getting lost if dashboard is not shown (#10597)
* Add conditional step that navigates users to the content section

* tweaked the text in the sections step as it refers to being in the content section, which may not always be the case (hence this PR)

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-11-22 10:46:29 +10:00
BatJan
1440213ef6 Add missing fallback values and fix en and en_us.xml keys 2021-11-22 01:39:50 +01:00
Jan Skovgaard
97071133c7 Documenttypes Permissions view: Add missing fallback texts and fix styling (#11619)
* Add missing fallback texts

* Change styling of "history" info
2021-11-22 01:20:38 +01:00
TBVanderley4545
12004a7854 Fix typo (#11027)
* Fix typo retrive to be retrieve throughout project.

* * Retain uppercase in descriptions.
* Add new directive fixing typo.
* Revert existing directive and template to previous to prevent breaking change.

* * Swap directives.

* * Revert.

* obsoletes public methods with typos. probably should find all refs and update those too

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-11-22 10:15:46 +10:00
Mario Lopez
ccffd264c9 fixes #9894 . Truncate block editor model title to 100 chars. (#10303)
* fixes #9894 . Truncate block editor model title to 100 chars.

* update to move max into controller logic

* null check name, just in case...

Co-authored-by: Mario Lopez <mario@monkii.com>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-11-22 09:43:43 +10:00
Marta
3b0da9be55 #7902 displaying messages on cancelled item creation (#7943)
* #7902 displaying messages on cancelled item creation

* remove debugger

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-11-22 09:12:01 +10:00
BatJan
17f6899f5d Add missing fallback texts 2021-11-22 08:58:20 +10:00
BatJan
77d3e17467 Add missing fallback text 2021-11-22 08:56:25 +10:00
Bjarne Fyrstenborg
a82ee72056 Ensure crop size in shown for slim thumbnails (#11481)
* Ensure there is space enough to render thumbnail size label

* Simplify crop size label

* Add original gray color for min/max icons and adjust margin to compensate for slider handle
2021-11-22 08:55:37 +10:00
BatJan
a9d2b0307f Add missing fallback text 2021-11-21 03:57:21 +01:00
BatJan
2605d7a03b Add missing fallback texts 2021-11-21 03:19:48 +01:00
BatJan
2f13bbfc52 Add missing fallback texts 2021-11-21 03:07:06 +01:00
Bjarke Berg
8fd013819d Merge remote-tracking branch 'origin/v9/9.1' into v9/dev 2021-11-19 09:29:45 +01:00
Paul Johnson
028648786e Fix optional id route param inferred as FromQuery (#11557)
* Fix optional id route param inferred as FromQuery

Closes #11554

* Prevent breaking change, UmbracoJsonModelBinderConvention is public class

* Set missing binding source for complex types

* Update UmbracoApiBehaviorApplicationModelProvider.cs

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2021-11-18 15:20:53 +01:00
Bjarke Berg
082e703863 Migrated / Rewritten ScopedNuCacheTests (#11636)
* Migrated / Rewritten ScopedNuCacheTests

* Cleanup

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-18 13:34:10 +01:00
Elitsa Marinovska
bfd17846b7 V9: Fix granular permissions for user groups (#11577)
* Fixes the treepicker for granular permissions to use a select callback instead of submit with the full selection

* Introduced UserGroup2NodeDto table, to allow users to save empty arrays of permissions

* Cleanup

* Fixed null issue in audit logging

* Fixed migration

* Fixed GetDeleteClauses

* Fixes for SqlCE, do not run multiple comments on one sql request

* Align behavior between content>permissions and usergroups>granularPpermissions

- It is now possible to save default values in content>permissions like in usergroups>granularPpermissions
- It is now possible to differentiate between we save an empty collection and we remove the granular permissions in content>permissions

* Fix comments

Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-11-18 11:20:49 +01:00
Michael Latouche
819bc21daa addig some French labels (#11545) 2021-11-18 08:18:22 +10:00
BatJan
43db605c31 Add missing fallback texts 2021-11-18 07:59:14 +10:00
Kevin Meilander
1125644eb3 in media selection, made folder name clickable to select into a folder. Added not allowed cursor on not allowed items. 2021-11-18 07:57:44 +10:00
Sibren
ba1518bc5c V8 Changed 'bevestig nieuw password' to 'bevestig nieuw wachtwoord' (#11649)
* V8 Changed 'bevestig nieuw password' to 'bevestig nieuw wachtwoord'

* Added extra missing translation: minimum x character(s) to go
2021-11-17 16:03:24 +01:00
BatJan
47da02c5f1 Add missing fallback text 2021-11-17 03:11:48 +01:00
Søren Kottal
8393fdecfb Adds support for simple markdown in property descriptions, and extended property descriptions (#11628)
* Adds support for simple markdown in property descriptions, and extended descriptions

* removes max-width for property descriptions (doesn't make sense to limit these IMO)
2021-11-17 10:38:15 +10:00
Bjarke Berg
b0a4a92f57 ContentVersion cleanup backoffice UI (#11637) (#11644)
* ContentVersion cleanup backoffice UI (#11637)

* init rollback ui prototype

* add busy state to button, deselect version, add pagination status

* add localisation

* style current version

* disable rollback button when nothing is selected

* stop click event

* Endpoints for paginated content versions.
Light on tests, tight on time.

* Endpoints to "pin" content versions

* camel case json output.
Not sure why json formatter not set for controller, bit risky to add it now

* wire up paging

* wire up pin/unpin

* rename getPagedRollbackVersions to getPagedContentVersions

* prevent selection of current version and current draft

* add current draft and current version to UI

* remove pointer if the row is not selectable

* Improve warning for globally disabled cleanup feature.

* Fix current loses prevent cleanup state on publish.

* Added umbracoLog audit entries for "pin" / "unpin"

* Match v9 defaults for keepVersions settings

* Fix - losing preventCleanup on save current with content changes

* update pin/unpin button labels

* fix pagination bug

* add missing "

* always send culture when a doc type can vary

Co-authored-by: Mads Rasmussen <madsr@hey.com>
# Conflicts:
#	src/Umbraco.Core/ContentEditing/ContentVersionMetaViewModel.cs
#	src/Umbraco.Core/Models/HistoricContentVersionMeta.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
#	src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Umbraco.Web.csproj

* Added tests

* Misc - missed translation update

* Bugfix - DocumentVersionRepository.Get should not join culture variation

* Bugfix - Missing write lock

* Removed unnecessary view model

* Misc - kill some warnings

* Misc - Kill some more warnings

* Fixed cypress rollback test

* Bugfix - Policy returns items to delete not items to keep.
Switch to inverse behavior.

# Conflicts:
#	src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs

Co-authored-by: Paul Johnson <pmj@umbraco.com>
2021-11-16 13:04:31 +01:00
Paul Johnson
a86baa4798 Bugfix - Policy returns items to delete not items to keep.
Switch to inverse behavior.
2021-11-16 11:53:16 +00:00
Paul Johnson
bdbc38e280 Bugfix - Missing write lock 2021-11-16 10:13:20 +00:00
Paul Johnson
cf9a6671a9 Bugfix - DocumentVersionRepository.Get should not join culture variation 2021-11-16 08:53:44 +00:00
Paul Johnson
d89725bd48 ContentVersion cleanup backoffice UI (#11637)
* init rollback ui prototype

* add busy state to button, deselect version, add pagination status

* add localisation

* style current version

* disable rollback button when nothing is selected

* stop click event

* Endpoints for paginated content versions.
Light on tests, tight on time.

* Endpoints to "pin" content versions

* camel case json output.
Not sure why json formatter not set for controller, bit risky to add it now

* wire up paging

* wire up pin/unpin

* rename getPagedRollbackVersions to getPagedContentVersions

* prevent selection of current version and current draft

* add current draft and current version to UI

* remove pointer if the row is not selectable

* Improve warning for globally disabled cleanup feature.

* Fix current loses prevent cleanup state on publish.

* Added umbracoLog audit entries for "pin" / "unpin"

* Match v9 defaults for keepVersions settings

* Fix - losing preventCleanup on save current with content changes

* update pin/unpin button labels

* fix pagination bug

* add missing "

* always send culture when a doc type can vary

Co-authored-by: Mads Rasmussen <madsr@hey.com>
2021-11-16 08:24:12 +01:00
Daniel Shuy
e2fdf43a7f contentpicker: Don't validate minNumber/maxNumber if 0 2021-11-16 07:02:52 +01:00
BatJan
b8f20d4548 Add missing fallback value 2021-11-16 13:10:21 +10:00
BatJan
e900197907 Wrap texts in umb-box 2021-11-16 13:08:12 +10:00
BatJan
a9cf12a600 Add "enable js" message changes + removal of the http-equiv meta tag 2021-11-16 02:26:45 +01:00
Matt Darby
0a626c6c2a Replace .first() with localize (#11341)
Replaced usage of first() with localize to target specific action in context menu
2021-11-16 09:25:04 +10:00
Daniel Shuy
284b4b9253 contentpicker: Don't validate minNumber/maxNumber if 0 2021-11-16 07:22:12 +10:00