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

42787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Overgaard
0d4d3ce33c add workaround for line-height issues with tinymce (#13700) 
based on this upstream issue: https://github.com/tinymce/tinymce/issues/6431
 2023-01-19 09:26:00 +01:00
Jacob Overgaard
cfdc4a9573 add the s html element to allow list for TinyMCE (#13697) 
Fixes #13637
 2023-01-19 09:25:44 +01:00
Kenn Jacobsen
8463d906a7 Make sure the property editor layout is contained within its container (prevent Z-index bleed-through) (#13583) 2023-01-12 10:55:02 +01:00
Nikolaj
314f79bd07 Bump version 2023-01-11 15:39:26 +01:00
Nikolaj
1438b0a731 Merge branch 'release/11.1' into v11/dev 2023-01-11 15:38:45 +01:00
Nikolaj
bad914842a Bump version 2023-01-11 10:25:31 +01:00
Andy Butland
a91c81ee56 Changed healthcheck collection configuration to use a concrete type to ensure configuration settings are bound. 2023-01-11 10:22:39 +01:00
Bjarke Berg
6d8a3c550f Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-01-06 08:44:50 +01:00
Nikolaj
2b72df09bb Merge branch 'release/11.1' into v11/dev 2022-12-21 13:54:29 +01:00
Nikolaj
392b48f159 Merge branch 'release/10.4' into v10/dev 2022-12-21 13:53:58 +01:00
Nikolaj Geisle
f37c02ea79 V10: Dont disable invited users (#13600) 
* Dont allow disable user when invited

* Use data instead of selection

* return succesfully disabled users

* Disable disable button when invited

* Add integration tests

* Remove unused usings

* Update src/Umbraco.Web.BackOffice/Controllers/UsersController.cs

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

* Create DisabledUsersModel

* use data.disabledUsers

* Return OK if no users to be saved

* User disabledUsersModel

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
 2022-12-21 10:07:11 +01:00
Nikolaj Geisle
a364141efa V10: Dont disable invited users (#13600) 
* Dont allow disable user when invited

* Use data instead of selection

* return succesfully disabled users

* Disable disable button when invited

* Add integration tests

* Remove unused usings

* Update src/Umbraco.Web.BackOffice/Controllers/UsersController.cs

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

* Create DisabledUsersModel

* use data.disabledUsers

* Return OK if no users to be saved

* User disabledUsersModel

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
 2022-12-21 09:57:00 +01:00
Bjarke Berg
03e00cbed2 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2022-12-20 10:19:36 +01:00
Bjarke Berg
fae74c53ba Merge remote-tracking branch 'origin/release/10.4' into v10/dev 2022-12-20 10:18:14 +01:00
Nikolaj Geisle
d62e2d731b V10: Dont disable invited users (#13600) 
* Dont allow disable user when invited

* Use data instead of selection

* return succesfully disabled users

* Disable disable button when invited

* Add integration tests

* Remove unused usings

* Update src/Umbraco.Web.BackOffice/Controllers/UsersController.cs

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

* Create DisabledUsersModel

* use data.disabledUsers

* Return OK if no users to be saved

* User disabledUsersModel

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
 2022-12-20 09:53:54 +01:00
Bjarke Berg
9c087f584d Fixed build warnings in ManagementApi 2022-12-20 08:53:37 +01:00
Ronald Barendse
832e44cb01 Also fix GetBackOfficeUrl in UrlHelperExtensions 2022-12-20 08:31:37 +01:00
Ronald Barendse
58da7f754b Rename fixed extension method to GetUmbracoBackOfficeUrl and obsolete old one 2022-12-20 08:31:37 +01:00
Ronald Barendse
751c1883ce Fix GetBackOfficeUrl extension method 2022-12-20 08:31:37 +01:00
Bjarke Berg
1332ba51e8 Merge pull request #13599 from umbraco/v11/bugfix/getbackofficeurl 
Add `GetUmbracoBackOfficeUrl` extension methods
 2022-12-20 08:30:45 +01:00
Bjarke Berg
e375ab4b1b Added new ContentAndWebRootFileProviderFactory and use that for IManifestFileProviderFactory, so manifests can be found in /app_plugins folder too (#13597) 
Fixes https://github.com/umbraco/Umbraco-CMS/issues/13565
 2022-12-20 08:10:47 +01:00
Bjarke Berg
6430c61ee9 Added new ContentAndWebRootFileProviderFactory and use that for IManifestFileProviderFactory, so manifests can be found in /app_plugins folder too (#13597) 
Fixes https://github.com/umbraco/Umbraco-CMS/issues/13565
 2022-12-20 07:00:07 +01:00
Ronald Barendse
532636cdbe Also fix GetBackOfficeUrl in UrlHelperExtensions 2022-12-19 12:04:35 +01:00
Ronald Barendse
900dd22277 Rename fixed extension method to GetUmbracoBackOfficeUrl and obsolete old one 2022-12-19 11:52:48 +01:00
Ronald Barendse
b457734f18 Fix GetBackOfficeUrl extension method 2022-12-19 11:31:18 +01:00
Kenn Jacobsen
ab82549fd6 Support space (and more) in tag groups (#13589) 2022-12-16 14:25:30 +01:00
Kenn Jacobsen
d173a99fc8 Support space (and more) in tag groups (#13589) 2022-12-16 14:24:51 +01:00
nikolajlauridsen
6835436ed5 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2022-12-16 14:24:17 +01:00
Kenn Jacobsen
9c21951d02 Support space (and more) in tag groups (#13589) 2022-12-16 14:23:31 +01:00
Kenn Jacobsen
a5a80fdd41 Multi URL picker improvements for V11 (#13586) 
* Use bulk lookup to find URLs for multi URL picker items

* Make sure URLs and anchors are loaded correctly when no culture is supplied
 2022-12-16 13:07:40 +01:00
Kenn Jacobsen
aee1d70f64 Multi URL picker improvements for V11 (#13586) 
* Use bulk lookup to find URLs for multi URL picker items

* Make sure URLs and anchors are loaded correctly when no culture is supplied
 2022-12-16 13:06:27 +01:00
Ronald Barendse
4d760a54c8 Set redirect URL when building model (#12969) 
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
(cherry picked from commit 544cb30602)
 2022-12-16 13:00:39 +01:00
Kenn Jacobsen
a897e3bdd3 Improved support for TinyMCE custom style formats (#13582) 2022-12-16 12:42:50 +01:00
Kenn Jacobsen
7b0f678c38 Improved support for TinyMCE custom style formats (#13582) 2022-12-16 12:41:19 +01:00
Ronald Barendse
48f4d8b7d1 Set redirect URL when building model (#12969) 
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
(cherry picked from commit 544cb30602)
 2022-12-16 11:25:00 +01:00
Ronald Barendse
544cb30602 Set redirect URL when building model (#12969) 
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2022-12-16 11:17:56 +01:00
Nikolaj
0234c5b637 Roll back BPlusTree dependency 2022-12-15 13:56:57 +01:00
Bjarke Berg
ace43452e4 Merge remote-tracking branch 'origin/v11/dev' into v11/dev 2022-12-15 10:36:23 +01:00
Bjarke Berg
6f4b60c76c Updated Nuget packages 2022-12-15 10:36:13 +01:00
Nikolaj
1c2b5d34fd Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
 2022-12-15 09:32:03 +01:00
Nikolaj Geisle
5066491726 Close shared connection (#13580) 
* Close shared connection

* Use transaction instead of shared connection
 2022-12-14 18:33:00 +01:00
Elitsa Marinovska
dabc7bed9b Enabling an Umbraco admin user to disable 2FA for a member (#13369) 
* Fix Invalid authentication code bug

* Add translation keys for 2fa

* Display toggle for 2FA on member

* Add TwoFactorEnabled prop when saving member

* Handle disabling of 2FA

* Fix tests

* Changing obsolete msg

(cherry picked from commit af6b8fc5cb)
 2022-12-14 13:50:16 +01:00
Jacob Overgaard
d6d4421a37 Tree picker support for selecting containers (#13507) 
Fixes https://github.com/umbraco/Umbraco-CMS/issues/13463

(cherry picked from commit 63e4adca92)
 2022-12-14 13:48:51 +01:00
Bjarne Fyrstenborg
aaababca9b UserController should use getLocalDate from dateHelper (#13469) 
* Use `getLocalDate` from dateHelper

* Remove duplicate import

* Keep function getLocalDate but use dateHelper

* Mark function as deprecated

(cherry picked from commit 30a7bca0ef)
 2022-12-14 13:45:01 +01:00
Erik-Jan Westendorp
77fdcf20ca Add AddManifestFilter extension method to UmbracoBuilder.CollectionBuilders.cs (#13161) 
(cherry picked from commit 65dd52ad05)
 2022-12-14 13:44:22 +01:00
Anders Bjerner
fb881d568b Added "loading" parameter to "umbEditorHeader" directive 
(cherry picked from commit 33668a5d95)
 2022-12-14 13:43:36 +01:00
Owain Jones
345feaf16a Updated welsh translations file 
(cherry picked from commit 079b2b7452)
 2022-12-14 13:41:28 +01:00
Anders Bjerner
f4012115a3 NullOrWhiteSpaceAsNull should be nullable 
(cherry picked from commit 5ffc2b1ccb)
 2022-12-14 13:40:40 +01:00
SimonJansson2
8bee709720 Adding swedish backoffice translations 
(cherry picked from commit 2071224d1f)
 2022-12-14 13:40:02 +01:00
Jason Elkin
90ffd25d96 Swap HSTS healthcheck status on localhost 
(cherry picked from commit 6cb53fd703)
 2022-12-14 13:39:10 +01:00