yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,554 Commits 4 Branches 7 Tags
d18afd351e778a5abc6552073e65f6997bb46015
Commit Graph

40554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
d18afd351e Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup 
# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/package.json
 2021-11-02 14:08:44 +01:00
Bjarke Berg
8e49b91692 Updated cyoress + testhelpers 2021-11-02 14:07:56 +01:00
Bjarke Berg
89aa7f87bd Updated cypress + testhelpers 2021-11-02 13:29:47 +01:00
Bjarke Berg
a1f93f84e2 changed default values 2021-11-02 11:59:34 +01:00
Bjarke Berg
bf7e356e34 Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup 
# Conflicts:
#	src/Umbraco.Core/Models/ContentEditing/HistoryCleanup.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs
 2021-11-02 10:59:09 +01:00
Bjarke Berg
456b8a8a7c Fixed test now that save of content types creates a cleanup policy 2021-11-02 10:58:16 +01:00
Bjarke Berg
ab06d21639 Fix namespace syntax 2021-11-02 10:42:51 +01:00
Bjarke Berg
0c3c88609e New projects starts with history cleanup enabled by default 2021-11-02 10:19:41 +01:00
Bjarke Berg
08c283656e aligned background job timings with v8 version 2021-11-02 10:17:36 +01:00
Bjarke Berg
6c628a46ba Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup 
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
 2021-11-02 09:45:45 +01:00
Bjarke Berg
b15f86c1c2 Fixed issue with history cleanup not persisted on first save 2021-11-02 09:45:20 +01:00
Bjarke Berg
47827cdd88 Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html
 2021-11-02 09:26:01 +01:00
Bjarke Berg
c7e9e94996 cleanup 2021-11-02 09:25:21 +01:00
Bjarke Berg
cec9a22a38 Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup 2021-11-02 09:18:34 +01:00
Bjarke Berg
b7d5fd4b26 Cleanup and fixed tests 2021-11-02 09:18:15 +01:00
Bjarke Berg
c3279f71c1 Negated bool check.. 2021-11-02 09:18:03 +01: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
Bjarke Berg
b0ff096a8a Fixed Tests 2021-10-29 13:58:50 +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
698e6b1533 Renamed interface to prepare for adding GetPagedRollbackVersions 2021-10-29 10:55:47 +02:00
Bjarke Berg
7aea361c21 Merge pull request #11538 from umbraco/v9/feature/merge-v8_29-10-2021 
V9: Merge v8 29-10-2021
 2021-10-29 10:48:20 +02:00
Bjarke Berg
bf5f1364fd Fix build after merge 2021-10-29 10:14:52 +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
Bjarke Berg
ae20c49590 Do paging in database, when viewing rollbacks 2021-10-28 10:02:04 +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
Rick Butterfield
ed167288c8 Change event name to rte.shortcut.saveAndPublish 2021-10-27 10:40:56 +10:00
Rick Butterfield
976711ef1c Publish hotkey doesn't work in RTE 2021-10-27 10:40:56 +10:00
BatJan
f12c4493b3 Map fallback texts 2021-10-27 10:18:57 +10:00
BatJan
3ee289fd2f Update fallback texts and add an ind so label and input are paired properly 2021-10-27 10:17:43 +10:00
BatJan
612f52985f Add new dictionary key 2021-10-27 10:17:43 +10:00
BatJan
5f7c00dc31 Add missing fallback texts 2021-10-27 10:14:11 +10:00
BatJan
f6854cddc9 Remove unused code 2021-10-27 10:14:11 +10:00
BatJan
5d4e1c6f98 Add missing fallback texts 2021-10-27 10:11:45 +10:00
BatJan
e8970c0d44 Add missing fallback texts 2021-10-27 10:09:26 +10:00
BatJan
35b0dda1f5 Add missing fallback texts 2021-10-27 02:03:03 +02:00
BatJan
57637da767 Add missing fallback texts 2021-10-27 10:02:28 +10:00
BatJan
80c9c09210 Add missing fallback values 2021-10-27 09:57:39 +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
d131df181b Add missing fallback texts 2021-10-27 09:56:54 +10:00
BatJan
d1005c5976 Add missing fallback texts 2021-10-27 09:38:23 +10:00
BatJan
713f204ea5 Add missing fallback texts 2021-10-27 09:37:31 +10:00
BatJan
090fe7e9ae Add missing fallback texts 2021-10-27 09:34:45 +10:00
BatJan
97775196ae Add missing fallback texts 2021-10-27 09:33:53 +10:00
BatJan
1fdfb2c434 Add missing fallback texts 2021-10-27 09:32:08 +10:00
BatJan
7794d55381 Add missing fallback texts 2021-10-27 09:29:44 +10:00