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

12477 Commits

Author SHA1 Message Date
Nikolaj Brask-Nielsen
d9c7640a8d Fixes userpicker filter 
#11520
 2021-11-11 13:13:21 +01:00
Matthew Care
fe7b696c7c Add support for media saving messages in dropzone (#11304) 
* WIP

Waiting for a response on the issue about how to proceed

* Support messages in dropzone

Update dropzone to allow the showing of messages that may be added in a media saving notification / handler

* Remove test code

Remove code used for testing

* Sort usings

Remove unused using

* Fix ordering

Ordering of files when they were being processed was backwards / out of order

* Add button to "okay" all messages

PR Feedback to add a button to dismiss all of the messages all at once.
Fixing a referencing issue with `currentFile`

Co-authored-by: Michael Latouche <michael@crossingpaths.be>
 2021-11-10 02:32:21 +01:00
Sebastiaan Janssen
e59f855aa9 Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS into v8/contrib 2021-11-09 11:04:01 +01:00
Ronald Barendse
2993c301f3 Hide localization key while loading 2021-11-08 23:42:06 +01:00
Ronald Barendse
1aeed3173b Do not allow deleting tabs with locked properties 2021-11-08 11:47:12 +01:00
Ronald Barendse
4f6a073f79 Re-bind readonly property state after save 2021-11-08 11:22:35 +01:00
Ronald Barendse
4bf598d9a4 Change IsLockedOut property to readonly when it's true (only allow unlocking members) 2021-11-08 11:22:07 +01:00
Ronald Barendse
5bda825fd1 Add Member Content App to display membership properties 2021-11-05 11:05:13 +01:00
Nikolaj Geisle
ba7db3b842 v9: Use localization keys instead of hardcoded string (#11406) 
* Update help.controller.js

* updated with better localization keys

* Added more translations

* Fixed spelling mistakes

* Updated help.controller.js according to review

* Fix localizaMany to include another call

* Cleanup

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-04 16:50:33 +01:00
Bjarke Berg
b8616426ee Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
#	src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2021-11-04 12:43:16 +01:00
Bjarke Berg
02dfb5af25 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/version-history-cleanup 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-11-04 11:40:11 +01:00
Sebastiaan Janssen
65a1e5adbe Merge branch 'v8/dev' into v9/contrib 2021-11-03 17:57:44 +01:00
Sebastiaan Janssen
2ec77a2fde Merge branch 'v8/contrib' into v8/dev 2021-11-03 17:53:51 +01:00
Jan Skovgaard
91a67cd3f0 Add missing fallback texts in various views (#11466) 2021-11-03 17:49:28 +01:00
Chriztian Steinmeier
b876771a75 Minor edits to the XPath query help sheet (#11385) 
* Clarify the use of placeholders

Since the placeholder is only replaced if it's at the beginning of the query, I've added a note about it.

Also made the spelling of XPath consistent and fixed a nesting error in the HTML.

* Rephrase a couple of sentences

(cherry picked from commit e04efe6067)
 2021-11-03 17:03:14 +01:00
Paul Seal
9a6a7ffa88 Added more detailed message when deleting items in the list view (#11375) 
* Added more detailed message when deleting items in the list view

* Update FR language file

(cherry picked from commit 14fe7d99a8)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-11-03 17:03:14 +01:00
Matthew Care
c7b285796d Update background size 
Update background size property to `contain` so that the whole image shows

(cherry picked from commit 215ef3d7b6)
 2021-11-03 17:03:14 +01:00
Chriztian Steinmeier
f1668c6bd7 Add positioning context 
A fallback for browsers that don't support `contain: content`, to make sure the positioning context is correct

(cherry picked from commit 8989c4ad13)
 2021-11-03 17:03:14 +01:00
Matthew Care
4a4b45fe27 Link insertion with no selected text 
TinyMCE requires text to be selected in order to insert links.
Added checks for if there is a text selection, and insert HTML content if there is not.
Link contents consists of the target name, or the target url if not populated

(cherry picked from commit e7f8e692c2)
 2021-11-03 17:03:14 +01:00
Patrick de Mooij
f39909dd90 8258: Added create dictionary item button 
(cherry picked from commit 49132e2b7f)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-11-03 17:03:14 +01:00
Nikolaj Geisle
a3797aaeef 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>
(cherry picked from commit 34be464cf8)

# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
 2021-11-03 17:03:14 +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
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