Sebastiaan Janssen
e3dc1b42dd
As per https://github.com/umbraco/Umbraco-CMS/pull/9613 - allowing the style tag in v4 of HtmlSanitizer is insecure, we can't upgrade to v5 yet so this is the temporary fix for the problem
...
(cherry picked from commit a9fdaaceb0 )
2021-01-08 15:40:32 +01:00
Sebastiaan Janssen
02d6011888
Merge branch 'v8/8.7' into v8/8.8
2020-12-15 14:23:33 +01:00
Sebastiaan Janssen
6d4990ad48
Merge branch 'v8/8.6' into v8/8.7
2020-12-15 14:22:57 +01:00
Bjarke Berg
cd1120e062
Merge pull request #9408 from umbraco/v8/bugfix/task-scheduler-maindom-logging
...
Ensure that TaskScheduler.Default is used anywhere that ContinueWith is used, adds more debug logging to MainDom operations
(cherry picked from commit 9a1b456949 )
# Conflicts:
# src/Umbraco.Core/Runtime/SqlMainDomLock.cs
2020-12-15 14:14:30 +01:00
Sebastiaan Janssen
d5d7d31c08
Merge branch 'v8/8.7' into v8/8.8
2020-12-14 15:06:51 +01:00
Sebastiaan Janssen
a141467bae
Merge branch 'v8/8.6' into v8/8.7
2020-12-14 15:04:38 +01:00
Bjarke Berg
9c4dce564e
Merge pull request #9543 from umbraco/v8/bugfix/sqlmaindom-server-terminated
...
SqlMainDomLock will stop listening if Sql Server connection terminates
2020-12-14 14:45:55 +01:00
Shannon
3927a8db67
Ensure we capture exceptions that occur when trying to create a transaction
2020-12-14 12:04:19 +11:00
Steve
7c20adef0e
Track ng-repeat with id instead of label ( #9340 )
...
(cherry picked from commit 39c4dcdaaa )
2020-11-23 10:42:33 +01:00
Sebastiaan Janssen
0608862da9
Revert "Adds icons from App_Plugins/**/Icons/*.svg ( #8884 )"
...
This reverts commit d7bf980f12 .
2020-11-04 11:25:45 +01:00
Sebastiaan Janssen
54ad4c2481
Bump version to 8.8.2
2020-11-04 11:19:32 +01:00
Sebastiaan Janssen
cea8ac35b3
Merge branch 'v8/8.8.1' into v8/8.8
2020-11-04 11:12:15 +01:00
Sebastiaan Janssen
bff6ded89d
Merge branch 'v8/8.7' into v8/8.8
2020-11-04 09:27:02 +01:00
Sebastiaan Janssen
d4fa37d6fb
Merge branch 'v8/8.6' into v8/8.7
2020-11-04 09:25:33 +01:00
Bjarke Berg
9cda7d1b5a
Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account
...
(cherry picked from commit 223b19cbd8 )
2020-11-03 10:22:15 +01:00
Sebastiaan Janssen
2d931877be
Bump version to 8.8.1
2020-10-23 14:41:09 +02:00
Sebastiaan Janssen
5b9e2dbad8
Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues ( #8198 )"
...
This reverts commit 1cd79d81af .
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
(cherry picked from commit f9b49fc5f3 )
(cherry picked from commit 22a1423324 )
2020-10-22 15:08:06 +02:00
Sebastiaan Janssen
ba6921ce6f
Merge branch 'v8/8.7' into v8/8.8
2020-10-22 14:34:00 +02:00
Sebastiaan Janssen
f3e37428ad
Merge branch 'v8/8.6' into v8/8.7
2020-10-22 14:29:53 +02:00
Sebastiaan Janssen
9202550537
Remove unused usings
2020-10-22 14:25:57 +02:00
Sebastiaan Janssen
e368607a4d
Bump version to 8.8.1
2020-10-22 14:15:57 +02:00
Sebastiaan Janssen
b69e65ab3b
Merge branch 'v8/8.7' into v8/8.8
...
# Conflicts:
# src/SolutionInfo.cs
2020-10-22 14:15:10 +02:00
Sebastiaan Janssen
3bb01e9418
Bump version to 8.7.1
2020-10-22 14:10:19 +02:00
Sebastiaan Janssen
2aefe899e4
Merge branch 'v8/8.6' into v8/8.7
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
2020-10-22 14:08:05 +02:00
Sebastiaan Janssen
843ea1d854
Bump version to 8.6.6
2020-10-22 13:56:15 +02:00
Shannon
22a7f94921
Merge branch 'temp_8879' of https://github.com/dawoe/Umbraco-CMS into v8/contrib
...
(cherry picked from commit 069529e9e2 )
2020-10-22 13:52:45 +02:00
Shannon
a6101ce499
Merge branch 'dawoe-temp_8879' into v8/contrib
...
(cherry picked from commit 35bf59dee4 )
2020-10-22 13:52:10 +02:00
Sebastiaan Janssen
81cbe365f6
Revert "Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues ( #8198 )"""
...
This reverts commit c903a01f15 .
2020-10-22 12:33:45 +02:00
Sebastiaan Janssen
f3af025c79
Revert "Takes the last commit from #9216 to make umb-confirm-action backwards compatible"
...
This reverts commit 174909d735 .
2020-10-22 12:33:19 +02:00
Sebastiaan Janssen
094897704c
Need null checks for Keys in case packages had been created without keys before
2020-10-22 10:56:49 +02:00
Sebastiaan Janssen
174909d735
Takes the last commit from #9216 to make umb-confirm-action backwards compatible
2020-10-22 10:43:37 +02:00
Sebastiaan Janssen
c903a01f15
Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues ( #8198 )""
...
This reverts commit 22a1423324 .
2020-10-22 09:53:02 +02:00
Niels Lyngsø
f3aad86413
updates CSS selector to match latest
...
(cherry picked from commit dc6c72c136 )
2020-10-22 09:47:33 +02:00
Warren Buckley
f1724a68b2
When exporting package.xml it will now use the UDI/Key so we can reimport with the same key
...
(cherry picked from commit 28954afcad )
2020-10-21 21:04:16 +02:00
Shannon Deminick
657f1fcdc7
Fixes regression issue with property values being updated in content repositories ( #9146 )
2020-10-21 20:30:35 +02:00
Warren Buckley
abc42b5438
Merge pull request #9215 from umbraco/v8/bugfix/9129-keep-model-value-reference-after-empty
...
9129 keep model value reference after empty
2020-10-20 12:35:16 +01:00
BatJan
7d3df87b7f
Change if check to be more specific ensuring it works in all picker instances
...
(cherry picked from commit 1c77ec1562 )
2020-10-13 17:25:26 +02:00
Sebastiaan Janssen
2d55d54a44
Merge branch 'v8/8.7' into v8/8.8
2020-10-13 16:47:38 +02:00
Sebastiaan Janssen
8778e9c84d
Merge branch 'v8/8.6' into v8/8.7
2020-10-13 16:46:14 +02:00
Arkadiusz Biel
b96776949f
make composers and components public
...
(cherry picked from commit f288a63342 )
2020-10-13 16:41:26 +02:00
Sebastiaan Janssen
22a1423324
Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues ( #8198 )"
...
This reverts commit 1cd79d81af .
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
(cherry picked from commit f9b49fc5f3 )
2020-10-13 15:39:06 +02:00
Søren Kottal
d7bf980f12
Adds icons from App_Plugins/**/Icons/*.svg ( #8884 )
...
(cherry picked from commit 3b551bdc5d )
2020-10-06 15:09:56 +02:00
Mike Masey
879d54b525
V8/feature/update icon picker to use umb icon ( #9063 )
...
(cherry picked from commit 27751a4ae7 )
2020-10-06 15:09:01 +02:00
Sebastiaan Janssen
cfd20833c7
Merge branch 'v8/8.7' into v8/8.8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
2020-10-06 09:12:35 +02:00
Bjarke Berg
ad4834cc68
Updated tour skip-step condition to the new format after introduction of umb-icon
...
(cherry picked from commit 1107e5d0fd )
2020-10-05 20:50:52 +02:00
Sebastiaan Janssen
67f42c02b9
Fix problem with ngdoc, the param requires a description
2020-10-02 13:08:09 +02:00
Warren Buckley
182184d1db
Merge pull request #8843 from umbraco/v8/bugfix/8839-use-icon-for-plus-sign
...
Review 8839 use icon for plus sign
2020-10-01 12:11:44 +01:00
Warren Buckley
ad3ff4d4d4
Merge pull request #8994 from umbraco/v8/bugfix/8924-clear-both-without-description
...
fixes 8924, Always clear both
2020-10-01 10:59:15 +01:00
Claus
19e2c8fa6e
Fix JS errors when creating folders in the settings section
...
(cherry picked from commit 4ecbb7abe6 )
2020-10-01 09:31:39 +02:00
Claus
b48145c87f
Fix JS error preventing newly created dictionary items from opening automatically
...
(cherry picked from commit 59f90bd08b )
2020-10-01 09:31:23 +02:00