yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,651 Commits 4 Branches 7 Tags
36d00bd9673e76996fcfbee943f03c39eea3be7e
Commit Graph

12147 Commits

Author SHA1 Message Date
Bjarke Berg
52a3e285a9 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
#	src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Manifest/PackageManifest.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/PropertyTagsExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
#	src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Serialization/JsonToStringConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Telemetry/ITelemetryService.cs
#	src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs
#	src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
#	src/Umbraco.Core/Telemetry/TelemetryService.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	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/web.Template.config
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Cache/DistributedCacheBinder.cs
#	src/Umbraco.Web/Compose/BlockEditorComponent.cs
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/Telemetry/ReportSiteTask.cs
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs
 2022-01-21 12:40:18 +01:00
Paul Johnson
c60d8c8ab8 Added EntityController.GetUrlsByIds support for int & guid + update MNTP (#11680) 
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.
 2022-01-19 08:32:33 +01:00
Nikolaj Geisle
16fb4f419a Merge pull request #11823 from umbraco/v8/bugfix/dont_show_stacktrace_in_production_mode 
Don't show stack trace in production mode
 2022-01-18 17:47:14 +01:00
Elitsa Marinovska
24519f6dad Allowlisting remote URLs for displaying content on the content dashboard (#11822) 
* Implement allowlisting of urls when fetching data for the content dashboard

* Adding a new setting in the config & removing inexistent one

* Adding description

* Adding description

* Tidy up code
 2022-01-18 15:38:03 +01:00
Elitsa Marinovska
72f30eb937 Adding else case 2022-01-18 15:19:05 +01:00
Elitsa Marinovska
cce40a0734 Merge branch 'v8/dev' into v8/bugfix/dont_show_stacktrace_in_production_mode 2022-01-18 14:37:14 +01:00
Nikolaj Geisle
0e9525d216 Added null check 2022-01-17 08:32:13 +01:00
Mole
0eed641235 Delete temp document type file if validation fails (#11836) 
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2022-01-13 13:12:44 +01:00
Ronald Barendse
2155062678 Prune/remove indentation from JSON property values (#11806) 
* Use Formatting.None for JSON property data in default value editor

* Use Formatting.None for JSON property data in custom value editors

* Use Formatting.None for JSON property data in Nested Content and Block List

* Use Formatting.None for JSON property tags

* Use Formatting.None for JSON configuration data

* Use Formatting.None in custom JSON converter

* Ensure empty tags and complex editor values are not stored

* Fix NestedContentPropertyComponentTests

* Do not store empty property data

* Use Formatting.None and don't store configured crops (without coordinates)

* Fix JSON deserialization of tags value
 2022-01-10 09:32:29 +01:00
Nikolaj Geisle
dfc3e56eb7 Check if we're in debug and set IncludeErrorPolicy accordingly 2022-01-05 13:16:07 +01:00
Ronald Barendse
75bb8051bf Prune Image Cropper and Media Picker (v3) values (#11805) 
* Clean up redundant/default Umbraco.ImageCropper data

* Fix ToString() and add HasCrops() method

* Re-use crop/focal point pruning for Umbraco.MediaPicker3

* Fix ImageCropperTest

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2022-01-05 11:11:27 +01:00
Mole
a54c5bb21d V8: Merge package telemetry from V9 (#11785) 
* Merge Telemetry classes from V9

* Use TelemetryService in ReportSiteTask

* Migrate tests
 2022-01-04 10:11:34 +01:00
Nikolaj Geisle
bd1c392dff Merge pull request #11776 from umbraco/v8/bugfix/AB15639-umbracoApplicationUrl-healthcheck 
Add a health check for umbraco application url
 2021-12-21 11:35:41 +01:00
Mole
7a5f72b5eb Use current request for emails (#11775) 
* Use current request for emails

* Fix tests
 2021-12-21 07:23:08 +01:00
Elitsa Marinovska
68fdf6521e Being more descriptive 2021-12-20 15:21:12 +01:00
Elitsa Marinovska
4e6d09b626 Adds a new Health Check 2021-12-20 14:37:18 +01:00
Andy Butland
fd1de8e103 Merge pull request #11757 from umbraco/v8/bugfix/handle-batched-server-messages-on-background-thread 
Handled flushing of cache instruction messages when created from handling events in a background thread
 2021-12-20 11:43:31 +01:00
Sebastiaan Janssen
7006461ba2 Revert "Added notifications toggle to user groups (#10450)" 
This reverts commit 4c6d4b9326.
 2021-12-16 16:30:18 +01:00
Sebastiaan Janssen
a3b721bb4c Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-12-14 14:19:59 +01:00
Andy Butland
d9a4c50a73 Refactored message related methods to allow provision of an HttpContext, and used this in DistributedCacheBinder to ensure messages created are flushed from the same context. 2021-12-14 09:23:55 +01:00
Paul Johnson
1c36af8c7e Map both settings and content data via property editors. (#11722) 
For persistence and rendering property editor frontend components.
 2021-12-06 10:35:44 +01:00
Nikolaj Brask-Nielsen
4c6d4b9326 Added notifications toggle to user groups (#10450) 
* Added notifications toggle

* Review: Update DatabaseDataCreator.cs

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

* Added migration

* Fix new file was excluded

* adapt DB  migration

Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Michael <michael@crossingpaths.be>
 2021-12-05 13:27:15 +01:00
Jeavon Leopold
b86505d8f2 Change httpsCheckInvalidUrl to healthCheckInvalidUrl 2021-11-28 12:58:02 +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
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
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
Sebastiaan Janssen
2aad2087a5 Merge branch 'v8/8.17' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
 2021-11-09 11:02:21 +01:00
Ronald Barendse
4bf598d9a4 Change IsLockedOut property to readonly when it's true (only allow unlocking members) 2021-11-08 11:22:07 +01:00
Ronald Barendse
5bda825fd1 Add Member Content App to display membership properties 2021-11-05 11:05:13 +01:00
Bjarke Berg
02dfb5af25 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/version-history-cleanup 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-11-04 11:40:11 +01:00
Sebastiaan Janssen
eee8bd5565 Fixed missing null check in BlockEditorPropertyEditor (#11184) 
Thanks @lauraneto - reviewed this and your fix solves the issue. #h5yr

(cherry picked from commit 23d2106277)

# Conflicts:
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
 2021-11-03 17:03:14 +01:00
Ronald Barendse
cd6d027e51 Mark standard Member group as inherited 2021-11-03 16:47:52 +01:00
Niels Lyngsø
23ce69db2f Additional optional sanitization of scripting in TinyMCE (#10653) 
(cherry picked from commit f68dba7bcb)
 2021-11-03 08:55:59 +01:00
Niels Lyngsø
f68dba7bcb Additional optional sanitization of scripting in TinyMCE (#10653) 2021-11-02 13:21:44 +01:00
Callum Whyte
bd23a5fd2d Making UmbracoTreeSearcherFields virtual for easier overriding 2021-11-01 17:33:33 +01:00
Martin Bentancour
56e05988f4 Validate fileName to prevent path traversal 2021-10-29 17:46:12 +02:00
Jeavon Leopold
c3625aed87 Fix the basehttpheader so that it's checking the root of the domain instead of /umbraco 2021-10-29 16:06:22 +02:00
Bjarke Berg
82a64ca589 Add message if prevent cleanup is globally disabled. 2021-10-29 14:51:38 +02:00
Bjarke Berg
b0ff096a8a Fixed Tests 2021-10-29 13:58:50 +02:00
Bjarke Berg
698e6b1533 Renamed interface to prepare for adding GetPagedRollbackVersions 2021-10-29 10:55:47 +02:00
Bjarke Berg
b96ec5a320 UI+Persistence for history cleanup per doc type 2021-10-28 14:14:07 +02:00
Paul Johnson
86f344c484 Post review feedback 
Less logging @ info level
More re-usable migration
 2021-10-26 16:30:57 +01:00
Paul Johnson
bba089c24c Implemented ContentVersionCleanup scheduled task. 
Note: adding ref to Microsoft.NET.Test.Sdk fixes AutoFixture AutoDataAttribute (and sub classes)
 2021-10-26 16:17:42 +01:00
Sebastiaan Janssen
cdd4bd1f69 Merge branch 'v8/dev' into v8/contrib 2021-10-26 15:54:34 +02:00
Paul Johnson
c61eaa2257 Merge pull request #11369 from umbraco/v8/bugfix/maxparametercount 
Add Constants.Sql.MaxParameterCount and update query logic
 2021-10-22 21:08:55 +01:00
Bjarke Berg
8acf7e147e 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>
 2021-10-22 09:58:47 +02:00
patrickdemooij9
809671b9ca Align template picking more towards the other pickers (#11363) 
* Align template picking more towards the other pickers

* style/cleanup - remove unused args, updated openItemPicker function name to openTemplatePicker since that's what we're opening

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-10-21 10:09:08 +10:00
Sebastiaan Janssen
4dc1ee64e0 Merge branch 'v8/dev' into v8/contrib 2021-10-19 15:49:24 +02:00
Ronald Barendse
db5028192f Merge branch 'v8/bugfix/AB14159-add-more-warnings-when-invalid-composition' of https://github.com/umbraco/Umbraco-CMS into v8/bugfix/AB14159-add-more-warnings-when-invalid-composition 2021-10-14 15:08:33 +02:00
Ronald Barendse
705a3ed4e8 Update composition validation error messages 2021-10-14 15:06:28 +02:00