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

42785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenn Jacobsen
d1fd1f16fd Move resources and implementations for System.Text.Json for reuse across projects (#13626) 
* Moved resources and implementations for System.Text.Json for reuse across projects.

* Move MvcBuilderExtensions as well
 2023-01-03 15:34:23 +01:00
Bjarke Berg
a1ef0903c9 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2022-12-20 10:20:44 +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
1332ba51e8 Merge pull request #13599 from umbraco/v11/bugfix/getbackofficeurl 
Add `GetUmbracoBackOfficeUrl` extension methods
 2022-12-20 08:30:45 +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
Elitsa Marinovska
fef793326f New Backoffice: Health check controller (#13543) 
* Adding health check controllers - getAll & getGroupByName

* Adding HealthCheckGroup mapper

* Adding viewModels

* Adding a factory for building a health check group with result view model

* Registering the mapper and factory

* Updating OpenApi.json

* Remove unnecessary checks - we instantiate the target before calling the Map()

* Adding ProducesResponseType for GetAll()

* Fixing usings

* Making checks required for a health check group

* Adding OK() around result to be explicit

* Adding default values to skip and take

* Adding Umbraco.Code comments

* Removing ? from HealthCheckGroupWithResultViewModel return type

* Move the grouping creation to the factory

* Adding Actions[] for each health check + mapping

* Defaulting ValueRequired to false

* Refactoring routes - from health-check to health-check-group

* Move to HealthCheckGroup folder

* Fix OpenApi.json

* Changing class name and making Key of HealthCheckActionViewModel non-nullable

* Fixing namespace

* Migrating ExecuteAction endpoint

* Add execute-action endpoint to OpenApi.json

* Use Task.FromResult() around the action result

* Fixing namespaces and swagger group name

* Fixing naming of the key in the health check action

* Fix tag names in OpenApi.json
 2022-12-19 13:50:18 +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
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
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
7b0f678c38 Improved support for TinyMCE custom style formats (#13582) 2022-12-16 12:41:19 +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