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

35861 Commits

Author SHA1 Message Date
Nikolaj Geisle
15fa9e1bc1 v9: Don't load all translation files (#11576) 
* Update systemInformation.ts

* Added lazy loading

* Update systemInformation.ts

* Update systemInformation.ts

* Use CharArrays.ForwardSlash instead of hardcoded string

* Align braces

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-12 14:37:50 +01:00
Bjarke Berg
3b73a87a68 Bumped right info :'( 2021-11-03 15:26:39 +01:00
Bjarke Berg
b4d00cc695 Bump version to 9.1.0-rc 2021-11-03 15:05:12 +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
Nikolaj Geisle
439e1b5596 Updated User after merge 2021-11-03 14:15:36 +01:00
Nikolaj Geisle
a54a76e113 Merge branch 'v9/dev' into v9/bugfix/dont-reload-page-with-edit-user-button 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
 2021-11-03 14:14:07 +01:00
Bjarke Berg
67604654c1 Fixed breaking changes 2021-11-03 14:03:28 +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
353686361b Merge branch 'v9/9.0' into v9/dev 2021-11-03 13:01:52 +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
Elitsa Marinovska
236bf88143 Cleanup 2021-11-03 10:23:50 +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
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
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
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
Nikolaj Geisle
4876108f71 change button to user editUser function 2021-10-27 09:49:05 +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