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

40576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bjarke Berg
f694a09a0c Merge pull request #11562 from umbraco/v9/feature/merge_and_clean_history_cleanup 
V9: Merged History cleanup from v8 and refactored to v9
 2021-11-03 12:35:14 +01:00
Bjarke Berg
a91d708bc5 cleanup 2021-11-03 12:11:05 +01:00
Bjarke Berg
fb953ad532 Only run this test on windows 2021-11-03 12:10:42 +01:00
Elitsa Marinovska
53a83abf1a Fix lang files 2021-11-03 11:25:38 +01:00
Elitsa Marinovska
236bf88143 Cleanup 2021-11-03 10:23:50 +01:00
Bjarke Berg
ab96e7c17d fix for linux+mac 2021-11-03 09:11:30 +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
Berg
a25183a063 Committing missing package-lock.json 2021-11-02 16:22:35 +01:00
Berg
4882837d60 Fixed test 2021-11-02 16:18:49 +01:00
Bjarke Berg
ef34fe5a8a Missing lock file 2021-11-02 14:25:42 +01:00
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
Sebastiaan Janssen
bb323b0286 Merge branch 'v8/dev' into v8/contrib 2021-11-02 13:29:33 +01:00
Niels Lyngsø
f68dba7bcb Additional optional sanitization of scripting in TinyMCE (#10653) 2021-11-02 13:21:44 +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
Callum Whyte
bd23a5fd2d Making UmbracoTreeSearcherFields virtual for easier overriding 2021-11-01 17:33:33 +01:00
Claus
1553f02b18 adding unit test for validating language xml files. (#7174) 
* adding unit test for validating language xml files.

* locating the language files by traversing instead of hardcoded path.

* debugging null refs.

* debugging

* Updated method of detecting language folder for XML tests, that should work correctly on the build server.

* Path amends to support running test on build server.

* Path amends to support running test on build server (2).

Co-authored-by: Andy Butland <abutland73@gmail.com>
 2021-11-01 14:50:54 +00:00
Anders Bjerner
152956bb1a Added ngdocs documentation for overlay.service.js 2021-10-31 12:16:27 +01:00
Anders Bjerner
7e55c469e3 Added extra selector for styling <code> elements in the content 2021-10-31 03:24:17 +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
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
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