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

35042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenn Jacobsen
8e01ac30d6 Cache the SVG icons serverside to boost performance (#9200) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-03-09 12:58:10 +01:00
Mole
adf504c20c Fix IncrementRequestedWriteLock 2021-03-09 09:33:34 +01:00
Mole
b554aa9484 Apply suggestions from code review 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-03-09 08:22:16 +01:00
Mole
6898fd2784 Only lock once when decrementing 2021-03-09 08:19:40 +01:00
Bjarke Berg
745014a4c3 User manager related updates (#9935) 
* Only allow not-admins to assign groups they have themselves

* Only admins is allowed to change password of other admins

* Fixed issue with deep clone of UserGroup. The Allowed sections was not cloned. This resulted in the allowed sections of the object stored in cache was updated, everytime we changed the allowed sections on an object cloned from the cache. Even if we did not save it.

* Only Admins are allowed to add sections to a user group, that they don't have access to themselves

* Align backend code with UI. User managers that is are not admin, can only assign the same groups new users, that they have themselves.

* Make existingGroupAliases and empty array when creating a new user

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2021-03-08 13:26:52 +01:00
Sebastiaan Janssen
4916c64848 Merge branch 'v8/dev' into v8/contrib 2021-03-08 12:29:14 +01:00
Sebastiaan Janssen
4a8a73f03d Merge branch 'v8/8.12' into v8/dev 2021-03-08 12:28:55 +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
Lars-Erik Aabech
008827f785 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>
 2021-03-08 12:23:03 +01:00
Sebastiaan Janssen
64105be274 Merge branch 'v8/dev' into v8/contrib 2021-03-08 10:09:08 +01:00
Sebastiaan Janssen
b59026ae5c Merge branch 'v8/8.12' into v8/dev 2021-03-08 10:08:36 +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
Niels Lyngsø
af65810048 no need to prevent or stop propagation on this. (#9933) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-03-08 09:44:33 +01:00
Callum Whyte
b770bdb93e Make properties full width in small infinite editors (#9812) 
* Make properties in small infinite editors full width

* bump specificity

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-03-07 09:39:48 +10:00
Ronald Barendse
678434a561 Remove orderBy filter for languages/variants 2021-03-07 09:09:41 +10:00
patrickdemooij9
4f823093f3 9940: Make sure that ordering is correct (#9944) 
* 9940: Make sure that ordering is correct

* 9940: Removed unnecessary ordering

* replace i with umb-icon directive

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-03-07 08:35:41 +10:00
Sebastiaan Janssen
475f7e6c3b Bump version to 8.12.0 2021-03-04 09:40:23 +01:00
Sebastiaan Janssen
7d0b5ecd14 Merge branch 'v8/dev' into v8/contrib 2021-03-03 17:57:00 +01:00
Sebastiaan Janssen
e75178e8a6 Merge branch 'v8/8.12' into v8/dev 2021-03-03 17:56:32 +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
Bjarke Berg
1bac97e0b0 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>
 2021-03-03 15:00:45 +01:00
Mole
f072387096 Wrap access to dictionaries in locks and make dictionaries internal readonly 2021-03-03 08:55:14 +01:00
Mole
c01fab97b8 Count requested locks in child scopes with the existing dictionaries. 
This way we don't have to have a two dictionaries AND two lists.
 2021-03-02 13:55:30 +01:00
Mole
8c99a8e8a7 Combine the two lock inner methods into one 
And add a couple of more unit tests
 2021-03-02 13:07:04 +01:00
Mole
e75edbcaf0 Add more tests. 2021-03-02 10:53:55 +01:00
Mole
65f2c5ee70 Bit of cleaning in Scope 2021-03-02 08:48:09 +01:00
Mole
37f6e007ba Merge remote-tracking branch 'origin/v8/dev' into v8/feature/10613-distributed-locks 2021-03-02 08:13:42 +01:00
Shannon Deminick
52b670973d The Value() method for IPublishedContent was not working with the defaultValue parameter (#9888) 
* The Value() method for IPublishedContent was not working with the defaultValue parameter

* Update src/Umbraco.Web/PublishedContentExtensions.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs

* Update src/Umbraco.Web/PublishedPropertyExtension.cs
 2021-03-02 01:23:26 +01:00