yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,044 Commits 4 Branches 7 Tags
530151f749c609130c9b1ebc205041ba6f5d3267
Commit Graph

34458 Commits

Author SHA1 Message Date
Bjarke Berg
530151f749 Merge pull request #10614 from umbraco/v9/RenderController-as-options 
RenderController as .NETCore IOptions pattern
 2021-07-07 15:38:37 +02:00
Bjarke Berg
28b0e108e4 Update src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs 2021-07-07 14:51:05 +02:00
Warren Buckley
b177c1ba12 Further Simplification of IOptions 2021-07-07 13:07:01 +01:00
Warren Buckley
8d936c08da Change RenderController defautl type to be swapped out using the .NETCore options pattern 2021-07-07 12:52:02 +01:00
Mole
a34dcab221 Remove ManifestWatcher 2021-07-07 09:34:42 +02:00
Bjarke Berg
87bd67c5fe Merge remote-tracking branch 'origin/v9/9.0-rc001' into v9/dev 2021-07-07 06:35:11 +02:00
Bjarke Berg
33a72c934c Merge pull request #10567 from umbraco/v9/task/package-refactor 
V9: Packages migrations and UI changes to support NuGet packages.
 2021-07-07 06:25:15 +02:00
Bjarke Berg
47469b4c73 Merge pull request #10592 from umbraco/v9/bugfix/sqlce-image-mapper-only-applied-for-sqlce 
V9: SqlCeImageMapper only applied for SqlCe
 2021-07-07 06:23:51 +02:00
Bjarke Berg
e379a8fd44 Update src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs 2021-07-06 21:20:31 +02:00
Bjarke Berg
d10ea08f0d Fixed issue from merge - MediaPickerWithCropsValueConverter was not update to inject _publishedValueFallback 2021-07-06 18:28:01 +02:00
Bjarke Berg
27d5aefc2d add missing variable in azure pipeline script and removed the auto generation of files until we figure out how to support both windows and linux for those. 2021-07-06 15:04:48 +02:00
berg
3a9c3f4f3b Fix build (preconditions) on linux 2021-07-06 14:21:04 +02:00
Bjarke Berg
65c654231d paths and stuff for linux development 2021-07-06 14:03:00 +02:00
Bjarke Berg
dbad75c66a Updated version number 2021-07-06 09:54:55 +02:00
Bjarke Berg
53fa3f5a3f Merge remote-tracking branch 'origin/v9/bugfix/sqlce-image-mapper-only-applied-for-sqlce' into v9/9.0-rc001 2021-07-06 09:53:52 +02:00
Bjarke Berg
19ca2f9c28 Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor 
# Conflicts:
#	src/Umbraco.Core/Configuration/Models/UnattendedSettings.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.Development.json
 2021-07-06 09:51:43 +02:00
Bjarke Berg
bed1c18a0b Merge pull request #10531 from umbraco/v9/cyclehack/autogeneration_of_json_schema 
V9: Autogeneration of AppSettings JSON schema and Merge the official + Umbraco
 2021-07-06 09:48:43 +02:00
Bjarke Berg
7f27e3b9c8 Merge pull request #10575 from umbraco/v9/feature/add-umbraco-authorized-controller 
V9: Add UmbracoAuthorizedController
 2021-07-06 09:46:25 +02:00
Bjarke Berg
85a0441658 Merge remote-tracking branch 'origin/v9/dev' into v9/cyclehack/autogeneration_of_json_schema 2021-07-06 07:55:48 +02:00
Bjarke Berg
d85266adc7 post merge cleanup in umbraco.web 2021-07-06 07:55:05 +02:00
Bjarke Berg
d9bc404290 Fixed issue in Umbraco.Web project (post merge) 2021-07-06 07:39:45 +02:00
Bjarke Berg
98e78fc22d Removed core debug from schema files 2021-07-06 07:34:56 +02:00
Bjarke Berg
ce22dcfe5b Merge remote-tracking branch 'origin/v9/dev' into v9/cyclehack/autogeneration_of_json_schema 2021-07-06 07:34:15 +02:00
Bjarke Berg
22d585b41c fix Umbraco.Web project 2021-07-06 07:04:18 +02:00
Shannon
9178e28485 Merge branch 'v9/dev' into v9/task/package-refactor 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
 2021-07-05 15:06:26 -06:00
Shannon
040b155454 Fixes benchmark project 2021-07-05 14:38:40 -06:00
Bjarke Berg
23293b77f6 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8-05072021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Constants-SqlTemplates.cs
#	src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
#	src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
#	src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
#	src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs
#	src/Umbraco.Core/Models/IReadOnlyContentBase.cs
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/Services/ILocalizedTextService.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Examine/UmbracoContentIndex.cs
#	src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
#	src/Umbraco.Infrastructure/IPublishedContentQuery.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Models/MediaWithCrops.cs
#	src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfiguration.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Infrastructure/PublishedContentQuery.cs
#	src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
#	src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
#	src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
#	src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs
#	src/Umbraco.Web.Common/Macros/MacroRenderer.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Compose/NotificationsComponent.cs
#	src/Umbraco.Web/Composing/ModuleInjector.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/NuCacheStatusController.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/TrySkipIisCustomErrorsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
#	src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/Runtime/WebRuntime.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
#	src/Umbraco.Web/Trees/MemberTreeController.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-07-05 20:58:04 +02:00
Warren Buckley
6b73ea767f Updates to Core.Configuration Models to use DefaultValue attribute to allow auto generated JSONSchema to give a default value in schema 2021-07-05 14:27:49 +01:00
Warren Buckley
cd36d050c5 Merge remote-tracking branch 'origin/v9/cyclehack/autogeneration_of_json_schema' into v9/cyclehack/autogeneration_of_json_schema 
# Conflicts:
#	src/JsonSchema/UmbracoJsonSchemaGeneratorSettings.cs
 2021-07-05 09:26:03 +01:00
Bjarke Berg
641530df14 Introduced IProviderSpecificMapperFactory, to allow some NPoco mappers to only be applied for specific providers, e.g. SqlCe and the SqlCEImageMapper 2021-07-05 08:24:44 +02:00
Mole
530da072b1 Merge pull request #10547 from umbraco/v9/bugfix/10459_show_cultures_with_english_names 
V9: Show cultures in dropdown with english names
 2021-07-02 09:02:15 +02:00
Bjarke Berg
c365d5de4b Merge pull request #10534 from umbraco/v9/task/cleanup-validation-results 
Streamlines response handling in controllers
 2021-07-01 23:04:45 +02:00
Bjarke Berg
adf6b5941b Fixed issue with pending migrations not using plan name. 2021-07-01 20:22:30 +02:00
Mole
f8d357f992 Add UmbracoAuthorizedController 2021-07-01 15:52:09 +02:00
Bjarke Berg
f1f7818c32 Merge pull request #10396 from Jeavon/task/add-urlhelper-crop-methods 
Add missing UrlHelper GetCropUrl methods
 2021-07-01 12:12:30 +02:00
Bjarke Berg
c8788ba996 Merge remote-tracking branch 'origin/v9/dev' into v9/dev 2021-07-01 12:09:40 +02:00
Bjarke Berg
03146090ac Added missing friendly extension method 2021-07-01 12:08:06 +02:00
Bjarke Berg
b63b0682d6 Updated to use the new nuGetPackageId + translations 2021-06-30 21:42:50 +02:00
Mads Rasmussen
fc108511d2 #10520 Correct mandatory markers in nested content (#10563) 
(cherry picked from commit c1a4e07e87)
 2021-06-30 16:34:29 +02:00
Niels Lyngsø
3e226384c3 #10520 ensure property culture in Nested Content (#10562) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 0b3c4a726c)
 2021-06-30 16:28:48 +02:00
Mole
0835423e68 Replace surface with area name if surface controller has one 2021-06-30 14:36:34 +02:00
Bjarke Berg
f1b91ab35d post merge fixes 2021-06-30 06:59:47 +02:00
Bjarke Berg
9e4dead0f5 Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor 
# Conflicts:
#	src/Umbraco.Core/Migrations/IMigration.cs
#	src/Umbraco.Core/Migrations/MigrationPlan.cs
#	src/Umbraco.Infrastructure/Migrations/IMigrationContext.cs
#	src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
 2021-06-29 14:23:08 +02:00
Sebastiaan Janssen
dc27a31a6f Fix creating / editing datatype in infinite editing mode, related to #10163 2021-06-29 13:35:22 +02:00
Elitsa Marinovska
861fc40572 Ability to configure a remote URL for displaying different content on the content dashboard (#10257) 
* Enabling configuration of remote URL for fetching content on the content dashboard and adding additional params indicating whether solution is running on Umbraco Cloud

* Determining if Umbraco is running on Umbraco Cloud by checking whether Umbraco.Deploy.Cloud.dll is present and making its value more accessible for other contexts. Passing a hosting parameter as string instead of boolean

* Changing from Unknown to OnPremises

* Updated content dashboard to use hard-coded URL but path derived from configuration.

Co-authored-by: Andy Butland <abutland73@gmail.com>
(cherry picked from commit 917c89cde7)
 2021-06-29 11:47:46 +02:00
Elitsa Marinovska
3e89e46840 Nested content optimizations (#10236) 
* Reducing the large amount of objects allocated and make use of the attemped dictionary cache

* Reverting optimization by passing data from a higher level - not really possible to achieve what we wanted and adding faster way to lookup value editors

(cherry picked from commit 897cb11f00)
 2021-06-29 09:56:45 +02:00
Bjarke Berg
451f98173f #10459 - Show cultures in dropdown with english names to make it consistent. 2021-06-28 18:43:46 +02:00
Bjarke Berg
73f8ed7e12 Merge pull request #10539 from nikcio/temp-fix-urls 
Fix grid property editor view urls
 2021-06-28 14:56:01 +02:00
Warren Buckley
1b9a00d2fd More JSONSchema config 
We dont want to serialize anything with [Obsolete] attribute and any XML C# comments with <example></example> will get generated as examples in the JSON schema
 2021-06-28 12:21:04 +01:00
Bjarke Berg
c4bd991546 Only serialize writeable properties to the schema 2021-06-28 12:54:05 +02:00