Commit Graph

35529 Commits

Author SHA1 Message Date
Bjarke Berg
d4391bd91e Merge pull request #8948 from AndyButland/feature/8651-move-image-file-types-from-config
Netcore: configuration of supported image file types
2020-09-23 09:05:51 +02:00
Bjarke Berg
e9597c0f3f https://github.com/umbraco/Umbraco-CMS/pull/8948 - Injecting UploadAutoFillProperties instead of newing it up
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 21:24:12 +02:00
Andy Butland
87a4128705 https://github.com/umbraco/Umbraco-CMS/pull/8948 - Renamed extension from IsImageFile to IsSupportedImageFormat, to align more with what is actually tested
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 21:12:04 +02:00
Bjarke Berg
2b8d5b7edd Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-move-image-file-types-from-config
# Conflicts:
#	src/Umbraco.Core/Configuration/Models/ContentImagingSettings.cs
#	src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
2020-09-22 21:10:19 +02:00
Bjarke Berg
9a6b75d5a7 Merge pull request #8938 from AndyButland/feature/8651-config-options-validation
NetCore: Added validation for configuration
2020-09-22 21:05:51 +02:00
Bjarke Berg
25c7418d66 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-validation
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
2020-09-22 20:25:28 +02:00
Bjarke Berg
0ea251945b Netcore: migrate more unittests (#8939)
* Migrated unit tests

* Migrated CoreThings tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated Property Editor unit tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated CoreXml tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved more tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* revert some IsSZArray test code

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed bad named test

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* removed unnecessary file mentions in csproj file

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2020-09-22 15:59:37 +02:00
Andy Butland
f42e8856db Removed supported image file types from configuration and set up as a property on IImageUrlGenerator, so different providers can indicate support for different sets of images. 2020-09-22 15:06:22 +02:00
Bjarke Berg
0c908a7bbb Introduced interface on BackOfficeUserManager (#8913)
* Introduced IBackOfficeUserManager

* Fixed test

* Moved class into own file

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2020-09-22 14:44:41 +02:00
Bjarke Berg
e6fba11279 Merge pull request #8932 from umbraco/netcore/feature/AB8239-nuget-updates
NetCore: Update NuGet packages to latest versions
2020-09-22 14:35:34 +02:00
Bjarke Berg
6fdf7082a0 Fixed issue models builder config and changed default mode to nothing
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 14:16:00 +02:00
Bjarke Berg
3533c6a959 Fixed issue with template using alpha001
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 14:14:27 +02:00
Bjarke Berg
35c39623a6 fix merge issue
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 13:45:20 +02:00
Bjarke Berg
69668abc18 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-22 13:32:21 +02:00
Bjarke Berg
c2f343b17d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-09-22 13:28:50 +02:00
Bjarke Berg
a28168667b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-09-22 13:28:03 +02:00
Bjarke Berg
a80de91031 Netcore: Handle tree authentication (#8866)
* Added helper methods to invoke the authorization filters of the other controller action

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Implemented Tree Auth

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* cleanup

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Throw forbidden if user has no access instead of InternalServerError

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* EnsureBackofficeSecurity for background jobs

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2020-09-22 13:19:54 +02:00
Bjarke Berg
8e9889d269 Post merge
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 12:44:36 +02:00
Bjarke Berg
bd534d340e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/IIconService.cs
#	src/Umbraco.Infrastructure/Services/Implement/IconService.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-09-22 12:38:36 +02:00
Claus
b12fad75da Merge remote-tracking branch 'origin/v8/8.8' into v8/dev 2020-09-22 10:38:25 +02:00
Claus
ab4d830626 Merge pull request #8930 from umbraco/v8/bug/8919-cache-icons-used-in-login-screen
Inject icons used in login screen to the runtime icon cache
2020-09-22 10:33:56 +02:00
Bjarke Berg
1badb69481 #8919 - Clean up obsolete ctor 2020-09-22 10:14:34 +02:00
Bjarke Berg
164fa24ef3 #8919 - Fix issue with wrong casing of variable name 2020-09-22 10:04:55 +02:00
Bjarke Berg
96facc4d35 Netcore: Introduce BackofficeSecurityAccessor (#8871)
* Introduced IWebSecurityAccessor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fixed tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed WebSecurity to BackofficeSecurity and all related names

* Fixes typos

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2020-09-22 10:01:00 +02:00
Bjarke Berg
5df3e051d3 Merge remote-tracking branch 'origin/v8/bug/8919-cache-icons-used-in-login-screen' into v8/bug/8919-cache-icons-used-in-login-screen
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IIconService.cs
#	src/Umbraco.Web/Services/IconService.cs
2020-09-22 09:21:45 +02:00
Bjarke Berg
ccc0e82579 #8919 - Avoid having fat controller and do not new up a controller in a model 2020-09-22 08:58:16 +02:00
Claus
6e56b16342 adding IconService 2020-09-22 08:57:48 +02:00
Claus
b327399cd2 adding icon svg data from IconController. 2020-09-22 08:11:58 +02:00
Bjarke Berg
525ca95acf uncomment SMTP info by default
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-22 08:01:04 +02:00
Andy Butland
fe158ec7d9 Removed custom validation of configuration enum values, reverting to framework based validation when binding direct to the enum values. 2020-09-21 21:20:46 +02:00
Andy Butland
1bd22d72c2 Removed configuration model builders. 2020-09-21 21:06:24 +02:00
Andy Butland
574e4d6446 Reverted change to enum parse from string configuration value, as we can't avoid the property being evaluated before the validation has occurred. 2020-09-21 16:23:58 +02:00
Andy Butland
1a59d6a978 Created constants for all configuration sections and used this and nameof expressions for building up configuration validation error messages. 2020-09-21 16:23:12 +02:00
Andy Butland
cce091de74 Throw exception on unexpected failure of creation on enum value from configuration, rather than falling back to a default.
This shouldn't happen in practice due to the configuration validation (e.g. by ContentSettingsValidator), so any failure of parsing here should be considered an exception.
2020-09-21 12:04:30 +02:00
Andy Butland
e032af5b06 Fixed failing tests. 2020-09-21 10:04:34 +02:00
Andy Butland
903e964925 Set default value for SmtpSettings DeliveryMethod configuration. 2020-09-21 08:54:03 +02:00
Andy Butland
309d39a34f Set default models builder config to nothing now have fixed issue that prevented it loading (as previous value of pure live currently erroring). 2020-09-21 08:54:03 +02:00
Andy Butland
d55b54ce49 Added unit tests for introduced unit test configuration setting builders. 2020-09-21 08:54:03 +02:00
Andy Butland
d5d6082d07 Moved configuration settings builders into own folder. 2020-09-21 08:54:03 +02:00
Andy Butland
8aadbe02d6 Added unit tests for configuration validators. 2020-09-21 08:54:03 +02:00
Andy Butland
bae4f2fb53 Changed NuCache settings to use a nullable integer. 2020-09-21 08:54:03 +02:00
Andy Butland
41c7f6989a Made config files alphabetical and aligned spacing. 2020-09-21 08:54:03 +02:00
Andy Butland
b9e67dde55 Added configuration validation for models builder and hosting settings.
Renamed models builder config class suffix to match others.
2020-09-18 12:53:10 +02:00
Andy Butland
eb62789b68 Added configuration validation for content imaging settings. 2020-09-18 12:02:12 +02:00
Andy Butland
1f8d7f18be Added configuration validation for content and request handler settings. 2020-09-18 11:30:26 +02:00
Bjarke Berg
d7ab7d3d2e Removed test code
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-18 08:30:48 +02:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Bjarke Berg
9cfae2c935 Merge pull request #8891 from umbraco/netcore/feature/8651-config-options-pattern-refactor
Netcore: Replace configurations with IOptions pattern
2020-09-18 08:20:03 +02:00
Bjarke Berg
380bec0e2f Fixed wrong config file path
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-18 07:05:40 +02:00
Elitsa Marinovska
66f35f428d Updates nuspec files with new nuget packages version 2020-09-17 18:47:24 +02:00