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

34248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
fc417e8ed8 Bump version to 8.11.3 2021-05-31 09:18:12 +02:00
Niels Lyngsø
1ac44542f6 Complex validation for RTE property editor (#10328) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 0a9c1c7c8e)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
 2021-05-26 13:10:18 +02:00
Mads Rasmussen
15923aafc7 Fixes tabbing-mode remains active after closing modal #9790 (#10074) 
(cherry picked from commit c881fa9e7d)
 2021-03-31 12:55:48 +02: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
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
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
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
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
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
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
e62cef6151 Revert "Fixes wrong dependency in nuspec file" 
This reverts commit 8642b61449.
 2021-01-28 12:05:19 +01:00
Sebastiaan Janssen
2999a48a59 Bump version to 8.11.1 2021-01-28 11:48:32 +01:00
Sebastiaan Janssen
abb469a404 Revert "Updated NPoco from 3.9.4 -> 4.0.2 (#9061)" 
This reverts commit d9c6584d90.
 2021-01-28 11:47:10 +01:00
Sebastiaan Janssen
f48b88e84f Merge branch 'v8/8.10' into v8/8.11 2021-01-20 15:07:14 +01:00
Sebastiaan Janssen
ef96b47899 Merge branch 'v8/8.9' into v8/8.10 2021-01-20 15:05:42 +01:00
Sebastiaan Janssen
092683ef7b Merge branch 'v8/8.8' into v8/8.9 2021-01-20 15:04:08 +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
ee02e34f64 Merge branch 'v8/8.10' into v8/8.11 2021-01-20 14:48:08 +01:00
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
120dbd358e Bump version to 8.11.0 2021-01-20 11:30:07 +01:00