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
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
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
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
Niels Lyngsø
f68dba7bcb
Additional optional sanitization of scripting in TinyMCE ( #10653 )
2021-11-02 13:21:44 +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
Anders Bjerner
152956bb1a
Added ngdocs documentation for overlay.service.js
2021-10-31 12:16:27 +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
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
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
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
