Commit Graph

34124 Commits

Author SHA1 Message Date
Sebastiaan Janssen
bfde020d4f Merge branch 'v8/8.9' into v8/8.10 2021-01-20 14:47:26 +01:00
Sebastiaan Janssen
2c037f604d Merge branch 'v8/8.8' into v8/8.9 2021-01-20 14:46:20 +01:00
Sebastiaan Janssen
908dbb1454 Merge branch 'v8/8.7' into v8/8.8
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
2021-01-20 14:42:22 +01:00
Niels Lyngsø
52e8da2ff2 Call rebindCallback on errors as well (#9690)
(cherry picked from commit da0c82aabd)
2021-01-20 14:28:37 +01:00
Niels Lyngsø
bc8f8366c2 Call rebindCallback on errors as well (#9688)
(cherry picked from commit 6d712b0d16)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
2021-01-20 14:17:02 +01:00
Sebastiaan Janssen
ae30a8db91 Bump version to 8.10.2 2021-01-20 11:29:04 +01:00
Sebastiaan Janssen
251c5d08ef Merge branch 'v8/8.9' into v8/8.10
# Conflicts:
#	src/SolutionInfo.cs
2021-01-20 11:28:31 +01:00
Sebastiaan Janssen
e913c2720c Bump version to 8.9.2 2021-01-20 11:27:40 +01:00
Sebastiaan Janssen
7d229bc5a9 Merge branch 'v8/8.8' into v8/8.9
# Conflicts:
#	src/SolutionInfo.cs
2021-01-20 11:27:10 +01:00
Sebastiaan Janssen
cda81ae9be Bump version to 8.8.3 2021-01-20 11:26:14 +01:00
Sebastiaan Janssen
435695e2c3 Merge branch 'v8/8.7' into v8/8.8
# Conflicts:
#	src/SolutionInfo.cs
2021-01-20 11:25:29 +01:00
Sebastiaan Janssen
0b3256c4fe Bump version to 8.7.2 2021-01-20 11:24:28 +01:00
Sebastiaan Janssen
59e27c4850 Merge branch 'v8/8.6' into v8/8.7
# Conflicts:
#	src/SolutionInfo.cs
2021-01-20 11:24:02 +01:00
Bjarne Fyrstenborg
b44a3e4280 Inject missing localization service
(cherry picked from commit c501ef0b68)
2021-01-20 11:19:37 +01:00
Sebastiaan Janssen
e18bda50a1 Bump version to 8.6.7 2021-01-20 11:18:18 +01:00
Sebastiaan Janssen
0744b38fe4 Fixes umbraco/Umbraco-CMS#9244
Log a warning instead of throwing an error so existing code doesn't fail
2021-01-20 11:16:28 +01:00
Mads Rasmussen
704fad92e5 Fixes: 9360: Nested validation freezes browser (#9677)
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
(cherry picked from commit b75a237162)
2021-01-20 11:09:14 +01:00
Niels Lyngsø
b6558cf734 empty value should also enable in order to stay backwards compatible.
(cherry picked from commit 2321fbfcab)
2021-01-20 11:06:03 +01:00
Nik
6a8c2a0a55 [AMEND] Updated the redirect URL Repository to search for entries wit… (#9653)
Co-authored-by: Nik Rimington <nrimington@spindogs.com>
(cherry picked from commit aa5470a801)
2021-01-19 17:30:00 +01:00
Bjarne Fyrstenborg
b1eebdd598 Add back icon name in class attribute to work again with font icons
(cherry picked from commit c1ebfc58cf)
2021-01-19 17:18:49 +01:00
Sebastiaan Janssen
46faf32c9e Merge branch 'v8/8.9' into v8/8.10 2021-01-13 17:02:29 +01:00
Warren Buckley
86504d69d3 Merge pull request #9644 from umbraco/v8/bug/9432-checkboxes-on-doctype-compositions
V8/bug/9432: Backoffice UI - checkboxes on doctype compositions uncheck after selecting an item

(cherry picked from commit 0d7a683c60)
2021-01-13 16:54:26 +01:00
Sebastiaan Janssen
7cbc09ba89 Merge branch 'v8/8.9' into v8/8.10
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
2021-01-13 16:49:33 +01:00
Sebastiaan Janssen
29979a55a0 Merge branch 'v8/8.8' into v8/8.9 2021-01-13 16:40:10 +01:00
Sebastiaan Janssen
2fd85c58b5 Merge branch 'v8/8.7' into v8/8.8 2021-01-13 16:38:47 +01:00
Callum Whyte
4dd554172b Nested content UI fixes (#9384)
* Fixing spacing of nested content header + icon

* Removing border from single Nested Content properties

* fix overlapping icon on nested content with multiple items

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 0fdd599596)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
2021-01-13 16:37:09 +01:00
Sebastiaan Janssen
542483fb18 Merge branch 'v8/8.9' into v8/8.10 2021-01-12 13:51:36 +01:00
Mads Rasmussen
3d9f765e01 changes search term model from primitive
(cherry picked from commit 8a65a0f92b)
2021-01-12 13:49:39 +01:00
Sebastiaan Janssen
a01bb67a4d Merge branch 'v8/8.9' into v8/8.10 2021-01-12 13:00:18 +01:00
Sebastiaan Janssen
870609f633 Merge branch 'v8/8.8' into v8/8.9 2021-01-12 12:57:29 +01:00
Sebastiaan Janssen
907fd9fa23 Merge branch 'v8/8.7' into v8/8.8 2021-01-12 12:54:12 +01:00
Sebastiaan Janssen
cfe5028dd0 Merge branch 'v8/8.6' into v8/8.7 2021-01-12 12:51:56 +01:00
Bjarke Berg
0f2db02289 Merge pull request #9640 from umbraco/v8/bugfix/memory-leak-9348
Fixes a memory leak caused by deep cloning

(cherry picked from commit 824349ae0d)
2021-01-12 12:41:01 +01:00
Sebastiaan Janssen
85d84967e5 Add LabelOnTop to the test 2021-01-11 12:21:06 +01:00
Sebastiaan Janssen
0602bc39f4 Merge branch 'v8/8.9' into v8/8.10 2021-01-11 12:20:18 +01:00
Sebastiaan Janssen
7324ad2875 Merge branch 'v8/8.8' into v8/8.9 2021-01-11 12:17:25 +01:00
Sebastiaan Janssen
6d13cbec8b Merge branch 'v8/8.7' into v8/8.8 2021-01-11 12:12:21 +01:00
Sebastiaan Janssen
406a665252 Merge branch 'v8/8.6' into v8/8.7 2021-01-11 12:08:33 +01:00
Sebastiaan Janssen
667dec454a Fix unit tests 2021-01-11 12:08:08 +01:00
Sebastiaan Janssen
51a6995b7f Merge branch 'v8/8.9' into v8/8.10 2021-01-11 11:36:21 +01:00
Sebastiaan Janssen
ffcc958f58 Merge branch 'v8/8.8' into v8/8.9 2021-01-11 11:35:38 +01:00
Sebastiaan Janssen
12e8dfd4c7 Merge branch 'v8/8.7' into v8/8.8 2021-01-11 11:35:13 +01:00
Sebastiaan Janssen
e249c4f68d Merge branch 'v8/8.6' into v8/8.7 2021-01-11 11:34:44 +01:00
Warren Buckley
3914be43b8 Merge pull request #9629 from umbraco/v8/bugfix/4637-variation-deleting-content
V8: Fix bug where allowing culture variation would delete content from element types #7471
(cherry picked from commit 463bc46675)
2021-01-11 11:32:11 +01:00
Sebastiaan Janssen
e246dea29e Merge branch 'v8/8.9' into v8/8.10 2021-01-08 15:42:04 +01:00
Sebastiaan Janssen
93d281289a Merge branch 'v8/8.8' into v8/8.9 2021-01-08 15:41:26 +01:00
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
b0afd3b862 Bump version to 8.10.1 2021-01-04 13:31:41 +01:00
Nathan Woulfe
ecf061229f Update edit.html 2021-01-04 10:56:52 +01:00
Sebastiaan Janssen
cb049144ee Register the TelemetryIdentifierStep 2020-12-16 09:57:43 +01:00