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

12395 Commits

Author SHA1 Message Date
Elitsa Marinovska
236bf88143 Cleanup 2021-11-03 10:23:50 +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
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
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
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
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
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
BatJan
0eb0b18560 Add missing fallback texts 2021-10-27 09:27:04 +10:00
BatJan
0d73d903d1 Add missing fallback texts 2021-10-27 09:26:05 +10:00
BatJan
87a8ea755e Add missing fallback texts 2021-10-27 09:18:57 +10:00
BatJan
072374913d Add missing fallback texts 2021-10-27 09:18:05 +10:00
BatJan
f1998ca5ab Add missing fallback texts 2021-10-27 09:17:00 +10:00
BatJan
965ce917bf Map missing fallback texts 2021-10-27 09:15:43 +10:00
BatJan
57634d5b4e Add missing fallback values 2021-10-27 09:14:47 +10:00
BatJan
20941016ff Map missing translations 2021-10-27 09:12:30 +10:00
BatJan
85c9d55b7a Add missing translations 2021-10-27 09:11:45 +10:00
Bjarne Fyrstenborg
1bffd97be9 Update noUiSlider to v15.5.0 2021-10-27 08:28:32 +10:00
BatJan
034e43d3b8 Add missing text fallback values 2021-10-27 08:27:22 +10:00
BatJan
ad17207072 Fix localizations 2021-10-27 08:23:16 +10:00
BatJan
1ce05d44e5 Map missing text values 2021-10-27 08:21:29 +10:00
BatJan
bed34b9916 Map missing values 2021-10-27 08:19:56 +10:00
BatJan
52f56628e9 Add missing fallback texts 2021-10-27 08:16:54 +10:00
BatJan
f9ed371cb7 Add missing fallback texts 2021-10-27 08:13:43 +10:00
Nikolaj Geisle
34be464cf8 v9: Fixing flaky cypress test "Macro in Grid" (#11485) 
* fixed flaky macro test and updated cypress version

* fixed flaky macro test and updated cypress version

* Update package.json

* Fixed failing tabs test

* Amend magic numbers with actual wait

* Update tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts

* Updated UI to click on button instead of icon

* Make macro test click bottom to ensure we're not clicking on icon

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-10-26 14:01:14 +01:00
BatJan
45dec5c181 Add missing fallack values 2021-10-26 01:21:54 +02:00
BatJan
79e8205556 Remove comma 2021-10-22 17:45:15 +10:00