Commit Graph

5843 Commits

Author SHA1 Message Date
Jeavon Leopold
b86505d8f2 Change httpsCheckInvalidUrl to healthCheckInvalidUrl 2021-11-28 12:58:02 +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
Bjarke Berg
78dc2d5721 Merge remote-tracking branch 'origin/v9/dev' into v10/dev
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
2021-11-22 19:43:20 +01: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
Elitsa Marinovska
61f459670c Update to .NET6 and ASP.NET Core 6 (#11652)
* Changed targetFramework in nuspec file & project files + updated NuGet dependencies

* Updated .net version in pipelines

* Updated .net version in templates

* Update more dependencies

* Fixed ambiguous call to DistinctBy() - part of Umbraco.Extensions and System.Linq

* Disabling the Razor source generators in .NET 6 due to error: "Cannot find the fallback endpoint specified by route values..."

* Fixed unit tests

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-11-18 15:35:42 +01:00
Michael Latouche
819bc21daa addig some French labels (#11545) 2021-11-18 08:18:22 +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
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
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
BatJan
a9cf12a600 Add "enable js" message changes + removal of the http-equiv meta tag 2021-11-16 02:26:45 +01:00
Rick Butterfield
f92070cee9 v9: Health Check still references web.config instead of appsettings.json (#11600)
* Fix an old reference to web.config instead of appsettings.json

* Match en_us.xml to en.xml

* adding FR translations
2021-11-11 01:00:04 +01:00
Sebastiaan Janssen
1fbf02d61e Merge branch 'v8/dev' into v8/contrib 2021-11-09 11:04:38 +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
Nikolaj Geisle
ba7db3b842 v9: Use localization keys instead of hardcoded string (#11406)
* Update help.controller.js

* updated with better localization keys

* Added more translations

* Fixed spelling mistakes

* Updated help.controller.js according to review

* Fix localizaMany to include another call

* Cleanup

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-04 16:50:33 +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
16b0e85ccb Merge branch 'v8/dev' into v9/dev
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
#	src/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
2021-11-03 17:12:33 +01:00
Paul Seal
9a6a7ffa88 Added more detailed message when deleting items in the list view (#11375)
* Added more detailed message when deleting items in the list view

* Update FR language file

(cherry picked from commit 14fe7d99a8)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
2021-11-03 17:03:14 +01:00
Patrick de Mooij
f39909dd90 8258: Added create dictionary item button
(cherry picked from commit 49132e2b7f)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
2021-11-03 17:03:14 +01:00
Sebastiaan Janssen
5123799e32 Bump version to 8.17.1 2021-11-03 14:59:00 +01:00
Bjarke Berg
7f061bd818 Merge pull request #11570 from umbraco/v9/feature/merge_v9_contrib_03-11-2021
V9: Merge `v9/contrib` 03-11-2021
2021-11-03 14:54:59 +01:00
Bjarke Berg
be65f12ed7 Updated nuget dependencies 2021-11-03 14:29:59 +01:00
Sebastiaan Janssen
692f952293 Merge branch 'v9/contrib' into v9/dev
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
2021-11-03 13:05:43 +01:00
Bjarke Berg
109487f117 Merge pull request #11568 from umbraco/v9/feature/merge_v8_03-11-2021
V9: Merge v8: 03-11-2021
2021-11-03 12:56:23 +01:00
Elitsa Marinovska
53a83abf1a Fix lang files 2021-11-03 11:25:38 +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
Bjarke Berg
c3ebbe23fd Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	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/Editors/ContentTypeController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
2021-11-03 08:44:12 +01:00
Niels Lyngsø
f68dba7bcb Additional optional sanitization of scripting in TinyMCE (#10653) 2021-11-02 13:21:44 +01:00
Jan Skovgaard
d70583f238 Media Grid View improvements (#11518)
* Add last Updated text under general

* Map missing fallback text values and refactor <i> to <umb-icon> directive

* fix icon styling
2021-10-29 19:44:05 +02:00
Ibrahim Muhammad Nada
a20915664d GitHub issue#11299 fix v8 (#11493)
* adding validation

* adding localization keys

* applying cleaning up notes

* fix spaces

* revert ex.xml

* spaces again

* keep it DRY

* chenge hasTabsAndFirstRender to hasTabsOrFirstRender

Co-authored-by: inada <inada@2p.com.sa>
2021-10-29 18:06:00 +02:00
Martin Bentancour
56e05988f4 Validate fileName to prevent path traversal 2021-10-29 17:46:12 +02:00
Bjarke Berg
926c74dcba Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
# Conflicts:
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Models/ContentEditing/HistoryCleanup.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
2021-10-29 15:04:27 +02:00
Bjarke Berg
a5c7af68cf Merge remote-tracking branch 'origin/v9/dev' into v9/dev 2021-10-29 15:00:48 +02:00
Bjarke Berg
53631ee48b Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/ContentEditing/HistoryCleanup.cs
#	src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs
#	src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs
#	src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/package-lock.json
#	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/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
2021-10-29 15:00:27 +02:00
Bjarke Berg
82a64ca589 Add message if prevent cleanup is globally disabled. 2021-10-29 14:51:38 +02:00
Sebastiaan Janssen
ef4a0f89fa Reverts accidental commit 2021-10-29 12:50:00 +02:00
Bjarke Berg
14fc4b6e25 Unbreak a breaking change :( 2021-10-29 11:08:40 +02:00
Bjarke Berg
02bf61667d Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8_29-10-2021
# Conflicts:
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	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/nl.xml
2021-10-29 09:52:39 +02:00
Bjarke Berg
b96ec5a320 UI+Persistence for history cleanup per doc type 2021-10-28 14:14:07 +02:00
Bjarne Fyrstenborg
b04609880b Accept udt as extension in import document type (#11108)
* Pass in invalid files

* Fix pattern and accept udt file extension

* Remove wildcard

* fix help text - referred to 'browse' button, which does not exist

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-10-27 12:05:08 +10:00
BatJan
f12c4493b3 Map fallback texts 2021-10-27 10:18:57 +10:00
BatJan
612f52985f Add new dictionary key 2021-10-27 10:17:43 +10:00
Nathan Woulfe
cf40b904c9 update styling in rollback text - removes stray comma, slight change to wording 2021-10-27 09:56:54 +10:00
BatJan
ad17207072 Fix localizations 2021-10-27 08:23:16 +10:00
BatJan
8b4398c006 Remove space 2021-10-27 08:19:56 +10: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
Paul Johnson
a1ac730633 Added XML configuration support for cleanup policy 2021-10-26 16:17:41 +01:00
Erik-Jan Westendorp
123bceef08 Localization add tab text dutch (#11346)
* Update nl.xml add addTab key

* tab to tablad

* Add translation to shortcuts sections

(cherry picked from commit d22297270b)
2021-10-26 15:58:03 +02:00
Bjarke Berg
7261091271 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/v8_merge_22_10_2021
# Conflicts:
#	src/Umbraco.Core/Exceptions/InvalidCompositionException.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
#	src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
#	src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/it.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/nl.xml
#	src/Umbraco.Web/Editors/MemberGroupController.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/NuCacheRebuildTests.cs
2021-10-22 08:51:01 +02:00