yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,720 Commits 4 Branches 7 Tags
0479ee41dd77d461663b7483d6671461cc384c8e
Commit Graph

33720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
0479ee41dd Merge branch 'v8/8.7' into v8/8.8 and bump version to 8.8.4 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:45:46 +01:00
Sebastiaan Janssen
1c5d95def4 Merge branch 'v8/8.6' into v8/8.7 and bump version to 8.7.3 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:42:10 +01:00
Sebastiaan Janssen
21bee00518 Bump version to 8.6.8 2021-03-11 14:38:19 +01:00
Sebastiaan Janssen
41283aead9 Fix wrong version reference 2021-03-09 14:54:13 +01:00
Kenn Jacobsen
b7553e311a Cache the SVG icons serverside to boost performance (#9200) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
(cherry picked from commit 8e01ac30d6)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Services/IconService.cs
 2021-03-09 14:22:22 +01:00
Chad
16573446db Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856) 2021-03-09 13:54:45 +01:00
Niels Lyngsø
cef1a73a2e no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit af65810048)
 2021-03-08 10:05:46 +01:00
Sebastiaan Janssen
5d8eed3eac Merge branch 'v8/8.7' into v8/8.8 2021-03-03 16:33:43 +01:00
Sebastiaan Janssen
cf3bef8017 Merge branch 'v8/8.6' into v8/8.7 2021-03-03 16:33:13 +01:00
Bjarke Berg
0b5bace2f7 Bugfix: Members not locked out after failed login attempts (#9921) 
* https://github.com/umbraco/Umbraco-CMS/issues/9861
Added test that shows the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fixed test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
More fix of test that shows the error. Caches needs to be active, otherwise it do not show the error

* https://github.com/umbraco/Umbraco-CMS/issues/9861
Fix issue by raise event and thereby update caches.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
(cherry picked from commit 1bac97e0b0)
 2021-03-03 16:32:28 +01:00
Sebastiaan Janssen
d5ee6c828d Merge branch 'v8/8.7' into v8/8.8 2021-03-01 16:02:37 +01:00
Sebastiaan Janssen
d4da9bdcb5 Merge branch 'v8/8.6' into v8/8.7 2021-03-01 16:02:11 +01:00
Bjarke Berg
8004c8dfd3 Merge pull request #9441 from umbraco/v8/bugfix/explicit-scope-examine 
Ensure there's explicit scopes used for all service access in the Examine indexing logic

(cherry picked from commit 3e7f912fcd)
 2021-03-01 15:55:36 +01:00
Mads Rasmussen
0c9b4565f1 updates the css to support items with long titles 
(cherry picked from commit 8e64fe54b1)
 2021-01-20 15:03:06 +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
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
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
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
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
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
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