yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,370 Commits 4 Branches 7 Tags
548435dcc3f1f23df7f83dcc77fdfc87963ea355
Commit Graph

34370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
548435dcc3 Bump version to 8.12.2 2021-03-17 17:40:47 +01:00
Nathan Woulfe
e7a1db5604 Add images in grid - fixes 9982 (#9987) 
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
(cherry picked from commit e2019777fb)
 2021-03-17 17:38:55 +01:00
Bjarke Berg
83719f3505 Fix issue with SqlMainDomLock that cannot use implicit lock timeouts … (#9973) 
(cherry picked from commit da5351dfcf)
 2021-03-12 09:28:45 +01:00
Sebastiaan Janssen
e0604e0a53 Merge branch 'v8/8.11' into v8/8.12 and bump version to 8.12.1 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:55:13 +01:00
Sebastiaan Janssen
e5aaa20863 Merge branch 'v8/8.10' into v8/8.11 and bump version to 8.11.2 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:52:58 +01:00
Sebastiaan Janssen
3a5327a84d Merge branch 'v8/8.9' into v8/8.10 and bump version to 8.10.3 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:50:35 +01:00
Sebastiaan Janssen
e75895ce48 Merge branch 'v8/8.8' into v8/8.9 and bump version to 8.9.3 
# Conflicts:
#	src/SolutionInfo.cs
 2021-03-11 14:47:33 +01:00
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
e43ff6cff1 Merge branch 'v8/8.11' into v8/8.12 2021-03-09 14:55:50 +01:00
Sebastiaan Janssen
5582b09614 Merge branch 'v8/8.10' into v8/8.11 2021-03-09 14:55:25 +01:00
Sebastiaan Janssen
8f59bbc3b3 Merge branch 'v8/8.9' into v8/8.10 2021-03-09 14:55:05 +01:00
Sebastiaan Janssen
c474f41b86 Merge branch 'v8/8.8' into v8/8.9 2021-03-09 14:54:31 +01:00
Sebastiaan Janssen
41283aead9 Fix wrong version reference 2021-03-09 14:54:13 +01:00
Sebastiaan Janssen
7dc95b55d3 Merge branch 'v8/8.11' into v8/8.12 
# Conflicts:
#	src/Umbraco.Web/Services/IconService.cs
 2021-03-09 14:51:54 +01:00
Sebastiaan Janssen
edab3507ec Merge branch 'v8/8.10' into v8/8.11 2021-03-09 14:49:08 +01:00
Sebastiaan Janssen
1d3d83466c Merge branch 'v8/8.9' into v8/8.10 2021-03-09 14:48:22 +01:00
Sebastiaan Janssen
4481e90f10 Merge branch 'v8/8.8' into v8/8.9 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2021-03-09 14:33:01 +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
Sebastiaan Janssen
49435708a5 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 12:28:21 +01:00
Sebastiaan Janssen
8b04c32dff Merge branch 'v8/8.10' into v8/8.11 2021-03-08 12:27:42 +01:00
Lars-Erik Aabech
fc447bb101 Should allow grid editors to use hash based settings (#9837) 
* Should allow grid editors to use hash based settings

* Swap to using vm in grid config controller, as well as showing button when there's map settings

* Included keys for styles in empty state check for grid settings

* converted the code into more AngularJS performant code

* Remove rogue change to grid.editors.config

* use watchCollection instead

Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 008827f785)
 2021-03-08 12:27:06 +01:00
Sebastiaan Janssen
c36a2bced6 Merge branch 'v8/8.11' into v8/8.12 2021-03-08 10:08:01 +01:00
Sebastiaan Janssen
0386a311d7 Merge branch 'v8/8.10' into v8/8.11 2021-03-08 10:07:40 +01:00
Sebastiaan Janssen
5825aa5dee Merge branch 'v8/8.9' into v8/8.10 2021-03-08 10:07:08 +01:00
Sebastiaan Janssen
ac41c5451e Merge branch 'v8/8.8' into v8/8.9 2021-03-08 10:06:37 +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
475f7e6c3b Bump version to 8.12.0 2021-03-04 09:40:23 +01:00
Sebastiaan Janssen
c82f379dd9 Merge branch 'v8/8.11' into v8/8.12 2021-03-03 16:35:53 +01:00
Sebastiaan Janssen
8e759d2dfe Merge branch 'v8/8.10' into v8/8.11 2021-03-03 16:35:28 +01:00
Sebastiaan Janssen
c10ed3693d Merge branch 'v8/8.9' into v8/8.10 2021-03-03 16:34:58 +01:00
Sebastiaan Janssen
62ac5434ff Merge branch 'v8/8.8' into v8/8.9 2021-03-03 16:34:02 +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
03b6f1ba7f Merge branch 'v8/8.11' into v8/8.12 2021-03-01 16:04:49 +01:00
Sebastiaan Janssen
22dee4e8d7 Merge branch 'v8/8.10' into v8/8.11 2021-03-01 16:04:13 +01:00
Sebastiaan Janssen
aaa8b0b4b2 Merge branch 'v8/8.9' into v8/8.10 2021-03-01 16:03:42 +01:00
Sebastiaan Janssen
7bc220b4b5 Merge branch 'v8/8.8' into v8/8.9 2021-03-01 16:03:18 +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
Sebastiaan Janssen
e848e396af Don't auto focus on the third menu item 2021-03-01 13:20:58 +01:00
Sebastiaan Janssen
5ee98919bc Fix test where selector wasn't specific enough 2021-02-22 17:22:04 +01:00
Sebastiaan Janssen
2cedf435a9 Fix error where the SQL for setting the timeout was missing a crucial space. 2021-02-22 16:41:44 +01:00
Chad
388e0283bc Fixes #9615 - Upgrade to Htmlsanitizer v5 (#9856) 
(cherry picked from commit a6e1c2e901)
 2021-02-22 09:56:13 +01:00
Shannon Deminick
64117921ea Fixes: After deleting a member, a reindex is attempted, which fails (#9807) 
(cherry picked from commit fa49d6ed10)
 2021-02-21 12:04:42 +01:00
Chad
ad0b70fc04 Speed up boot times and Improve Json (De)Serialization performance and reduce memory usage by reusing JsonSerializerSettings (#9670) 
(cherry picked from commit 75ee3b9622)
 2021-02-21 11:01:35 +01:00