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

35876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
5ed94065a7 Fixes issue with exceptions in logs because we are trying to unbind from httpapplication events but you cannot do that. 2020-09-24 18:45:26 +10:00
Mole
7369ffc5fd Change name of ContentApp back 2020-09-24 10:29:53 +02:00
Bjarke Berg
2779b19737 Fixed test 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-24 10:13:22 +02:00
Mole
25f13629cb Register logging before trying to use ILoggerFactory in UmbracoCoreServiceCollectionExtensions 
Before we used serviceProvider.GetService<ILoggerFactory>() with a service provider that were build before logging was configured, therefore the loggerfactory was empty and a lot of logs were missing
 2020-09-24 09:39:48 +02:00
Bjarke Berg
35443f0e71 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
 2020-09-24 08:24:35 +02:00
Bjarke Berg
1587d7f4b7 Changed test to use to use 0.5.0.0 version 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 19:46:53 +02:00
Bjarke Berg
cfc0722a5f Merge branch 'netcore/alpha002' into netcore/netcore 2020-09-23 18:25:22 +02:00
Bjarke Berg
0ba059903f Changed version in assembly to 0.5.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 18:24:31 +02:00
Bjarke Berg
88dfc0708b Added launchSettings to template 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 17:23:01 +02:00
Bjarke Berg
26a04ea2fe Added launchSettings to template 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 17:22:06 +02:00
Sebastiaan Janssen
fe3f604122 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919

(cherry picked from commit 0531fce9e2)
 2020-09-23 16:21:34 +02:00
Sebastiaan Janssen
0531fce9e2 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919
 2020-09-23 16:20:55 +02:00
Mole
0e737c0903 Use a SiriLogger that logs to console in UmbracoIntegrationTest 
AFAIK ConsoleLoggerFactory gets disposed when host is disposed causing all tests but the ones from the first test fixture to fail. As far as I'm aware it's not possible to make it not dispose ConsoleLoggerFactory, however it is possible with Sirilog
 2020-09-23 15:37:19 +02:00
Bjarke Berg
18dcf4975b update nuspec to use ImageSharp.Web 1.0.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:50:49 +02:00
Bjarke Berg
ec7db00bd2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-09-23 14:29:42 +02:00
Bjarke Berg
acc7065fa1 Fixed issue with models builder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:22:53 +02:00
Bjarke Berg
435cf2623a Updated ImageSharp.Web to 1.0.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:00:08 +02:00
Mole
8258178c5a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
 2020-09-23 13:32:49 +02:00
Bjarke Berg
0d731e7a40 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	build/build-bootstrap.ps1
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
 2020-09-23 13:28:36 +02:00
Mole
ca5868d52c Merge pull request #8771 from umbraco/netcore/bugfix/reset_password 
Fixed reset password for functionality
 2020-09-23 13:09:47 +02:00
Mole
2bd4f683f2 Remove empty line in BackOfficeController 2020-09-23 13:06:18 +02:00
Bjarke Berg
e3c8bd8ced Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
 2020-09-23 12:54:13 +02:00
Sebastiaan Janssen
f5affd0521 Merge branch 'v8/8.6' into v8/8.7 2020-09-23 11:32:22 +02:00
Bjarke Berg
56820b164f Fixed issue in AngularValueResetPasswordCodeInfoScript 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 11:30:16 +02:00
Sebastiaan Janssen
75830e1d3e Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:24:32 +02:00
Sebastiaan Janssen
f29c5f0e3b Merge branch 'v8/dev' into v8/contrib 2020-09-23 11:18:43 +02:00
Sebastiaan Janssen
95a46580d6 Merge branch 'v8/8.7' into v8/dev 2020-09-23 11:10:56 +02:00
Sebastiaan Janssen
d6275f34f7 Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:09:40 +02:00
Bjarke Berg
5045a580cc Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/reset_password 2020-09-23 10:55:13 +02:00
Mole
3d52949938 Merge pull request #8944 from umbraco/netcore/bugfix/8856-user_culture_not_used_everywhere 
Netcore: Bugfix for user culture not used everywhere
 2020-09-23 09:58:30 +02:00
Mole
75608919cd Merge pull request #8925 from umbraco/netcore/feature/use-serilog-to-log-all-messages 
Netcore: Use serilog to log all messages and use appsettings as config
 2020-09-23 09:37:43 +02:00
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
f61796c265 revert appsettings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 08:58:11 +02:00
Bjarke Berg
ae657b1078 https://github.com/umbraco/Umbraco-CMS/issues/8856 - also consider Tree controllers as backoffice 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 08:55:25 +02:00
Bjarke Berg
28df8d086b Injecting a logger instead of logger factory 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 08:40:05 +02:00
Bjarke Berg
f413f279eb Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
#	src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
#	src/Umbraco.Tests/Components/ComponentTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
#	src/Umbraco.Tests/Published/ConvertersTests.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
#	src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
 2020-09-23 07:59:10 +02:00
Bjarne Fyrstenborg
59784a1551 Update noUiSlider to v14.6.2 2020-09-23 14:18:16 +10: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
4880b16512 Fix tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 19:59:01 +02:00
Bjarke Berg
60424dd54f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/reset_password 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 2020-09-22 19:35:49 +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
Mole
9d9d1955e9 Fix merge 2020-09-22 15:28:44 +02:00
Mole
4b5fbf83e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
 2020-09-22 15:24:01 +02:00
Mole
438515fa66 Merge Netcore: Use serilog to log all messages and use appsettings as config into Netcore/feature/migrate logging 2020-09-22 15:09:16 +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
Claus
a2cb264f27 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 
(cherry picked from commit 6122bffa24)
 2020-09-22 14:49:28 +02:00