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

2348 Commits

Author SHA1 Message Date
Paul Johnson
235918ecfc Merge branch 'v9/dev' into v10/feature/merge-v9-dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/Actions/ActionAssignDomain.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
 2022-01-18 11:37:43 +00:00
Bjarke Berg
642c216f94 Serve Media and App_Plugins using WebRootFileProvider (and allow changing the physical media path) (#11783) 
* Allow changing UmbracoMediaPath to an absolute path. Also ensure Imagesharp are handing requests outside of the wwwroot folder.

* Let UmbracoMediaUrl fallback to UmbracoMediaPath when empty

* Add FileSystemFileProvider to expose an IFileSystem as IFileProvider

* Replace IUmbracoMediaFileProvider with IFileProviderFactory implementation

* Fix issue resolving relative paths when media URL has changed

* Remove FileSystemFileProvider and require explicitly implementing IFileProviderFactory

* Update tests (UnauthorizedAccessException isn't thrown anymore for rooted files)

* Update test to use UmbracoMediaUrl

* Add UmbracoMediaPhysicalRootPath global setting

* Remove MediaFileManagerImageProvider and use composited file providers

* Move CreateFileProvider to IFileSystem extension method

* Add rooted path tests

Co-authored-by: Ronald Barendse <ronald@barend.se>
 2022-01-06 13:35:24 +01:00
Bjarke Berg
78dc2d5721 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
 2021-11-22 19:43:20 +01:00
Elitsa Marinovska
61f459670c Update to .NET6 and ASP.NET Core 6 (#11652) 
* Changed targetFramework in nuspec file & project files + updated NuGet dependencies

* Updated .net version in pipelines

* Updated .net version in templates

* Update more dependencies

* Fixed ambiguous call to DistinctBy() - part of Umbraco.Extensions and System.Linq

* Disabling the Razor source generators in .NET 6 due to error: "Cannot find the fallback endpoint specified by route values..."

* Fixed unit tests

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-11-18 15:35:42 +01:00
Bjarke Berg
be65f12ed7 Updated nuget dependencies 2021-11-03 14:29:59 +01:00
Bjarke Berg
53631ee48b Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/ContentEditing/HistoryCleanup.cs
#	src/Umbraco.Core/Models/ContentEditing/DocumentTypeDisplay.cs
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository.cs
#	src/Umbraco.Core/Scheduling/ContentVersionCleanup.cs
#	src/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	tests/Umbraco.Tests.Common/Extensions/AutoMoqDataAttribute.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_Integration.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupService_Tests_UnitTests.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
 2021-10-29 15:00:27 +02:00
Bjarke Berg
698e6b1533 Renamed interface to prepare for adding GetPagedRollbackVersions 2021-10-29 10:55:47 +02:00
Bjarke Berg
02bf61667d Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8_29-10-2021 
# Conflicts:
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2021-10-29 09:52:39 +02:00
Bjarke Berg
b96ec5a320 UI+Persistence for history cleanup per doc type 2021-10-28 14:14:07 +02:00
Paul Johnson
bba089c24c Implemented ContentVersionCleanup scheduled task. 
Note: adding ref to Microsoft.NET.Test.Sdk fixes AutoFixture AutoDataAttribute (and sub classes)
 2021-10-26 16:17:42 +01:00
Paul Johnson
a1ac730633 Added XML configuration support for cleanup policy 2021-10-26 16:17:41 +01:00
Paul Johnson
d865448177 Added database migration to support version cleanup feature 2021-10-26 16:17:41 +01:00
Ronald Barendse
c5ba23a15c Add Constants.Sql.MaxParameterCount 2021-10-13 13:32:30 +02:00
Bjarke Berg
e95a759181 Updated nuget package dependencies 2021-09-20 12:59:14 +02:00
Bjarne Fyrstenborg
eb7b570002 Include MediaService extensions 2021-09-13 15:19:28 +02:00
Shannon Deminick
5fadb238ee Don't eagerly acquire distributed (SQL) locks (#10171) 2021-09-13 13:09:47 +02:00
Ronald Barendse
8ce4993cdc Fix failing tests because of missing property group alias 2021-09-07 14:40:45 +02:00
Ronald Barendse
ee2da5b8ca Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc 2021-09-07 12:10:58 +02:00
Ronald Barendse
c29383dae0 Merge branch 'v8/contrib' into v8/feature/reintroduce-tabs 2021-08-31 16:41:55 +02:00
Chad
125ebe40fb Replace use of dynamic type with POCOs (#10917) 2021-08-30 19:10:50 +02:00
Chad Currie
dcc533fd8d Update Serilog.Enrichers.Process to 2.0.2 as it fixes a leak 2021-08-23 14:47:50 +02:00
Paul Johnson
8dd645f36e Merge pull request #10880 from umbraco/v9/bugfix/suppress-notifications-migrations 
Suppress scope notifications during migrations
 2021-08-23 13:25:47 +01:00
Ronald Barendse
60ced5db8c Retarget migration to 8.17 2021-08-19 23:29:40 +02:00
Ronald Barendse
e5a1e0f4e9 Merge branch 'v8/contrib' into v8/feature/reintroduce-tabs 2021-08-19 13:44:17 +02:00
Shannon
8ede33f6ba Updates how package migrations are run. Only publish a single notification. 2021-08-18 12:01:56 -06:00
Warren Buckley
9671a08be2 Ensure Nuget dependencies are upto date excpet NPoco as breaking changes in major 2021-08-18 11:38:23 +01:00
Warren Buckley
139c2db3b3 Update MS Nuget Packages 2021-08-06 10:33:25 +01:00
Rowan Bottema
6a12f4af90 Update Serilog dependencies 
This should at least fix #10793 because of a memory leak fix in Serilog.Sinks.Map 1.0.2. Also updated the rest for good measure.

Note that Serilog.Sinks.File is not upgraded to the latest version because it is a new major (4.1.0 -> 5.0.0). Also note that Serilog.Filters.Expressions is deprecated and should be replaced by Serilog.Expressions. I considered both out of scope for this fix.
 2021-08-05 11:56:37 +02:00
Bjarke Berg
43ae1fa3e4 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_dev_03082021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/ContentEditing/ContentTypesByKeys.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-08-03 09:48:34 +02:00
Niels Lyngsø
66cb8167db Merge remote-tracking branch 'origin/v8/dev' into v8/feature/reintroduce-tabs 2021-07-23 14:15:48 +02:00
Warren Buckley
4df4b3eeaf Merge pull request #10603 from umbraco/v8/bugfix/creating-document-types-sqlce 
Fix duplicate ID when creating document types with SQL CE
 2021-07-21 12:11:22 +01:00
nzdev
044c900c2b Make IPropertyCacheCompressionOptions useful out of the box. key = "Umbraco.Web.PublishedCache.NuCache.CompressUnPublishedContent" value = "true" will compress all ntext properties on unpublished content 2021-07-09 20:14:35 +12:00
Mole
dfa161adb4 Add migration 2021-07-06 13:08:44 +02:00
Ronald Barendse
2b6e87d1e2 Merge branch 'v8/dev' into v8/prototype/doctype-tabs 2021-06-30 14:33:59 +02:00
Sebastiaan Janssen
c6832491b6 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/obsoletemediapickernotice.html
 2021-06-28 09:34:26 +02:00
Bjarke Berg
c170123f3a Clean up and fix for xml docs for forms (at least locally) 2021-06-25 09:35:39 +02:00
Shannon
94d525d88f small changes based on review. 2021-06-22 15:12:07 -06:00
Bjarke Berg
1775b21591 Updated nuget dependencies 2021-06-22 15:41:24 +02:00
Ronald Barendse
740de049fd Merge branch 'v8/dev' into v8/prototype/doctype-tabs 2021-06-22 13:33:37 +02:00
Ronald Barendse
17d2c4cab9 Convert level into group type and ensure names are unique again 2021-06-22 11:45:23 +02:00
Warren Buckley
dc334c1015 Automated install user with Environment Variables & unattended.user.json (#9930) 
* Try to update admin user unattended

This will fail because we're not in install runtime state

* Create a new user instead of trying to update the default admin

* Create a new user instead of trying to update the default admin

* Use same logic from NewInstallStep to modify the SuperUser aka -1

* Add back stuff after merge conflict from v8/dev

* Add event to be raised

* Trying to wire up events

* Remove commented out code - just need to figure out why event is not hit/triggered

* Read Appsettings as opposed to ENV variables

* Use a JSON file that deletes itself as storing secrets in web.config will be accidently committed

* Remove component based event - Component were only initialized after DB creation

* Move UnattendedInstall down after _factory

* Remove commented out code

* Fixed issue where upgrader UI would show up - needed to recheck the Runtimelevel after UnattenedInstall

* Apply suggestions from code review - Thanks Marc :)

Co-authored-by: Marc Goodson <marc@moriyama.co.uk>

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
Co-authored-by: Marc Goodson <marc@moriyama.co.uk>
 2021-06-16 10:00:29 +01:00
Ronald Barendse
89c9d34553 Add icon column to migration 2021-06-11 09:56:30 +02:00
Ronald Barendse
e15ed2c509 Update database structure to hierarchical property groups 2021-06-10 15:11:32 +02:00
Ronald Barendse
36b4a994e1 Merge branch 'v8/dev' into v8/prototype/doctype-tabs 2021-06-07 10:58:37 +02:00
Bjarke Berg
025a7aca29 Updated nuget packages 2021-05-19 21:44:33 +02:00
Shannon
2739e049a6 Merge remote-tracking branch 'origin/v8/contrib' into v8/feature/nucache-perf 
# Conflicts:
#	src/Umbraco.TestData/LoadTestComposer.cs
 2021-05-17 11:56:11 -07:00
Bjarke Berg
fe36c80ba0 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
#	src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Composing/TypeLoaderTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-05-11 12:33:31 +02:00
Warren Buckley
cb01e11586 Deterministic Builds for Sourcelink (#10237) 
* Remove the properties from each .CSProj

* Move this into Directory.Build.props so all CSProj can get all these extra properties

* Add conditional to only add extra property to get the Deterministic green checkmark when running on Azure Pipleine
 2021-05-06 19:56:43 +02:00
Warren Buckley
f43f37dc35 Umbraco V9 Adds SourceLink package from Microsoft for people to debug into the relevent build commit with GitHub source code (#10224) 
We had this previously in Umbraco V8
 2021-05-04 18:58:50 +02:00
Mole
51a720b16c Add references to Umbraco.Code as PrivateAsset (#10148) 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-04-27 09:07:10 +02:00