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

35823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mole
1fdebb6bd9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-09-22 13:49:25 +02:00
Bjarke Berg
35c39623a6 fix merge issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 13:45:20 +02:00
Mole
c0616d516a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
#	src/Umbraco.Web.Common/Install/InstallController.cs
 2020-09-22 13:44:22 +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
Mole
a91f6f6a29 Clean PublishedSnapshotService a bit 2020-09-22 13:22:44 +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
Claus
6122bffa24 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 2020-09-22 13:14:03 +02:00
Mole
b7cbbf8c28 Use ConfigureLogging instead of trying to add logging manually 2020-09-22 13:00:39 +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
8fddb52f9a Merge remote-tracking branch 'origin/v8/bugfix/examine-reindex' into v8/8.6 2020-09-22 11:42:44 +02:00
Bjarke Berg
02e3cc7c30 https://github.com/umbraco/Umbraco-CMS/issues/8856 - Aligned namespaces of controllers and also determine BackOfficeApiArea as backoffice 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 11:07:01 +02:00
Claus
b12fad75da Merge remote-tracking branch 'origin/v8/8.8' into v8/dev 2020-09-22 10:38:25 +02:00
Mole
beb0d038a7 Move InernalsVisibleTo into AssemblyInfo instead of TestControllerFactory 2020-09-22 10:35:58 +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
Mole
9dc17b0873 Use serviceProvider instead of Current when creating TypeFinder in CollectionExtensions 
Current hasn't been initialized at this point
 2020-09-22 10:16:38 +02:00
Mole
dae7f0a1a7 Register logging ASAP in UmbracoIntegrationTest pretty much everything needs it 2020-09-22 10:15:45 +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
Mole
d8c4107c93 Remove unused logger from CoreRuntimeTests 2020-09-22 09:54:39 +02:00
Mole
5611081803 Initialize LoggerFactory before trying to pass to to UmbracoApplicationBase 2020-09-22 09:42:11 +02:00
Mole
e22bbc46a7 Register ILogger<> and ILoggerFactory in CompositionExtensions_Essentials 2020-09-22 09:41:42 +02:00
Mole
5cf06c2c9a Register ILogger<ComponentCollection> in ComponentTests 2020-09-22 09:33:57 +02:00
Mole
7e3b213c94 Mock ILogger not Logger 2020-09-22 09:33:30 +02:00
Mole
6cce7ef3f2 Make internals visible to Moq, otherwise we cannot mock ILogger<InternalClass> 
For some reason adding the assembly attribute doesn't work for the test project, I need to look into this.
 2020-09-22 09:27:32 +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
Mole
4917025327 Change some Microsoft.Extensions.Logging.ILogger to just ILogger 2020-09-21 15:34:22 +02:00
Warren Buckley
3950f3286e Merge pull request #8815 from umbraco/v8/bugfix/events-unsubscribe 
Ensure event handlers are unsubscribed  in Core Components

(cherry picked from commit e7f98a5690)
 2020-09-21 15:23:02 +02:00
Mole
5dae6235c5 Initialize ILoggerFactory in Current 2020-09-21 15:16:25 +02:00
Mole
3be396f384 Use Factory.GetInstance in Current 2020-09-21 15:12:14 +02:00
Mole
5c9a681566 Use typed logger for XmlPublishedSnapshotService 2020-09-21 15:11:40 +02:00
Mole
d512a43ba6 Make majority of unit tests pass 2020-09-21 14:35:28 +02:00
Mole
ed30cd1800 Remove ILogger and its classes implementing it 2020-09-21 13:09:48 +02:00
Mole
d3ae921293 Remove most of the last references and rename LoggerFactory_ to LoggerFactory in UmbracoTestBase 2020-09-21 13:04:57 +02:00
Warren Buckley
e7f98a5690 Merge pull request #8815 from umbraco/v8/bugfix/events-unsubscribe 
Ensure event handlers are unsubscribed  in Core Components
 2020-09-21 11:27:47 +01: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