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

42971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
adfc38503c Upgrade BPlusTree dependency 2022-12-15 14:06:59 +01:00
Nikolaj
e86b90faff Merge branch 'v11/dev' into v12/dev 2022-12-15 14:03:22 +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
Mole
0b04ae76da New backoffice: Redirect Url Management controller (#13572) 
* Add status endpoint

* Refactor GetStatus to use a factory for the viewmodel

* Move controllers to correct namespace

* Add response type to GetStatus

* Create query endpoint

* Create GetAll endpoint

* Add by key

* Add delete by key

* Rename enabled controller

* Add SetEnabled endpoint

* Update OpenApi.json

* Replace query endpoint with a optional filter parameter

* Use enum to enabled and disable url tracking

* Update OpenApi.json

* Add bad request response type to GetAll endpoint
 2022-12-15 10:04:44 +01:00
Nikolaj
2bab96fb85 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2022-12-15 09:56:28 +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
CyberReiter
43a4a49409 adding some german translations 
(cherry picked from commit ce60e72452)
 2022-12-14 13:38:22 +01:00
Sebastiaan Janssen
2265d0a928 Changed Logo button behavior to be more consistent with the rest of the header 
(cherry picked from commit 7d9ee69fbc)
 2022-12-14 13:37:38 +01:00
Tobias Mønster
67d6e9f3df Renames Installer form from "myForm" to "installerForm" (#12806) 
Co-authored-by: Joe Glombek <joe@glombek.com>
(cherry picked from commit 6cad4013e4)
 2022-12-14 13:36:53 +01:00
Anders Bjerner
8ff1d0769e Added shortcut="esc" to RTE HTML editor close button 
(cherry picked from commit 4922144528)
 2022-12-14 13:35:01 +01:00
Tiffany
4dbd7de0d6 Tree Roots are H1 
(cherry picked from commit 105670dcc1)
 2022-12-14 13:34:17 +01:00
Matthew Wise
508898c4ee standarising ActionLetter and ActionName for IAction 
(cherry picked from commit ec56778c9f)
 2022-12-14 13:32:08 +01:00
Kristian Tolleshaug Mørch
ba53b47b72 Ensure format processor is before quality processor. 
(cherry picked from commit 69c725b3ec)
 2022-12-14 13:31:08 +01:00
ustadstar
faf69e4349 Fix check for existing userStatesFilter 
(cherry picked from commit f7e73fbff5)
 2022-12-14 13:26:28 +01:00
Paul Seal
5db507cb96 created an add current domain button to the cultures and hostnames sc… (#13436) 
* created an add current domain button to the cultures and hostnames screen

* removed unwanted space

(cherry picked from commit d86d29807d)
 2022-12-14 13:23:34 +01:00
Corné Hoskam
479dde280f Added various Block Grid translations (NL) - Pt 2. (#13508) 
* Added various translations

* Added another translation

* Change request

* Added various other area translations

* Resolve conflict

* Forgot one!

* Update nl.xml

(cherry picked from commit 9099bf44ac)
 2022-12-14 13:22:44 +01:00
Corné Hoskam
93c0a4ee38 Added various Block Grid translations (EN & NL) (#13488) 
* Added various translations

* Added another translation

* Change request

(cherry picked from commit a4e67bf444)

# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
 2022-12-14 13:21:59 +01:00
Vlael Layug
a810c59774 add default culture when there's only 1 language configured 
(cherry picked from commit f7b42a50cc)
 2022-12-14 13:19:08 +01:00
Erik-Jan Westendorp
0b36c1195e Use constants instead of hardcoded strings 
(cherry picked from commit 4f129baebd)
 2022-12-14 13:17:49 +01:00
Justin Neville
5f4dc7a994 Added aria label to time period on log dashboard 
(cherry picked from commit 8bf6a9246f)
 2022-12-14 13:17:00 +01:00
Justin Neville
04be6889ab Allow empty valuesets to be indexed so the back-offce does not hang when rebuilding empty indexes 
(cherry picked from commit 88ff05a836)
 2022-12-14 13:15:53 +01:00
Markus Johansson
3bd9da00cc LogViewe: Adding support for destructed properties 
(cherry picked from commit d2ab80534a)
 2022-12-14 13:15:01 +01:00
Lotte Pitcher
a0e8049916 Remove reference to installing a local package via backoffice (#13330) 
(cherry picked from commit da9eae1252)
 2022-12-14 13:14:19 +01:00
CyberReiter
328f5e0817 make use of spans in UriExtensions to make them faster 
(cherry picked from commit 02dcf98e3d)
 2022-12-14 13:13:24 +01:00
Vitor Rodrigues
57a29e4085 Re-use any existing ReloadableLogger 
It's possible that consumers have already set up a bootstrap logger themselves before Umbraco had a chance too, if that's the case we just reload it.

(cherry picked from commit 7ad1e638e6)
 2022-12-14 13:12:37 +01:00
Vitor Rodrigues
ea3c862228 Added missing content-type header to BootFailedMiddleware response 
When Umbraco is configured with X-Content-Type-Options nosniff as is recommended (there's even a health check for it), any boot failure would simply show the html source code in the browser instead of properly rendering the html, as the content-type wasn't being set.

(cherry picked from commit d4c921264d)
 2022-12-14 13:11:32 +01:00
Kenn Jacobsen
dc2701cb5e Handle StringValues in ObjectExtensions.TryConvertTo (#13575) 2022-12-14 11:39:36 +01:00
Marc Goodson
b87b9bebe2 Adjust the wording of some of the helper text around the new Block Grid editor (#13484) 
(cherry picked from commit 2461b7d805)

# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
 2022-12-14 11:03:45 +01:00
Kenn Jacobsen
c0d022be10 Fix wrongfully reported pending package migrations (#13574) 2022-12-14 11:00:12 +01:00
Bjarne Fyrstenborg
2f1ef29690 Adjust sorting of block grid editor groups to y-axis only (#13225) 
fixes https://github.com/umbraco/Umbraco-CMS/issues/13180

(cherry picked from commit d4c5f5017f)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
 2022-12-14 10:53:35 +01:00
CyberReiter
d46d5aac0d Use ToArray instead of ToList 
(cherry picked from commit f99378c5d3)
 2022-12-14 10:47:16 +01:00
Lars-Erik Aabech
c0d5b544f5 Ensure culture is always set in LocalizeText 
(cherry picked from commit 4d23e8a6bd)
 2022-12-14 10:45:56 +01:00
Karl Butler
303abaea28 Accessibility Fixes for Users and Packages pages (#13087) 
(cherry picked from commit 2d560e9766)
 2022-12-14 10:41:49 +01:00
patrickdemooij9
481d496641 Use span in StripFileExtension to speed up and use less memory (#13101) 
(cherry picked from commit 475cea40a1)
 2022-12-14 10:38:04 +01:00