yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,938 Commits 4 Branches 7 Tags
98e78fc22d607af110ca2d2cc7f144b190f34a95
Commit Graph

38938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
040b155454 Fixes benchmark project 2021-07-05 14:38:40 -06:00
Bjarke Berg
9560a2801e Merge pull request #10598 from umbraco/v9/feature/merge-v8-05072021 
V9: Merge v8 05072021
 2021-07-05 21:40:31 +02: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
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
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
0aa54422f3 Merge pull request #10560 from umbraco/v9/bugfix/route-plugin-controllers-to-area 
V9: Route plugin controllers by area
 2021-07-01 10:25:13 +02:00
Sebastiaan Janssen
9cc9ecf858 Merge branch 'v8/8.15' into v8/dev 2021-06-30 16:57:05 +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
Niels Lyngsø
0b3c4a726c #10520 ensure property culture in Nested Content (#10562) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-06-30 16:27:53 +02:00
Mads Rasmussen
c1a4e07e87 #10520 Correct mandatory markers in nested content (#10563) 2021-06-30 15:41:07 +02:00
Mole
0835423e68 Replace surface with area name if surface controller has one 2021-06-30 14:36:34 +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
Sebastiaan Janssen
4f46edbaa9 Bump version to 8.15.0-rc 2021-06-29 11:47:16 +02:00
Elitsa Marinovska
917c89cde7 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>
 2021-06-29 11:46:07 +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
Elitsa Marinovska
897cb11f00 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
 2021-06-29 09:55:02 +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
Sebastiaan Janssen
31e9c875f5 Bump version to 8.15.0-rc 2021-06-28 09:36:09 +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
Mole
83ee9b4699 Reduce sql queries when rendering blocklists in the content panel (#10521) 
Co-authored-by: Nikolaj <nel@umbraco.dk>
 2021-06-28 09:32:42 +02:00
Ronald Barendse
5b9cd1bd87 Improvements to media pickers/crop handling and URL generation (#10529) 2021-06-28 09:28:32 +02:00
Bjarke Berg
6e9abb17e7 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
 2021-06-28 08:57:38 +02:00
Chad
44c814a550 Fix Rollback feature not creating diffs when properties are moved between tabs in EditorModel events (#10376) 
* Find the old property by alias instead of by indexes as if you move around properties in the EditorModel events Rollback breaks.

* optimise property lookup - avoids iterating entire property set

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-06-28 10:20:38 +10:00
Nikcio
5776007e95 Fix grid property editor view urls 2021-06-26 12:34:46 +02:00
Shannon
7f76884ba2 removes UmbracoNotificationSuccessResponse and use OK method 2021-06-25 10:42:09 -06:00
Shannon
055dacbb0e Streamlines validation response handling in controllers 
This makes validation response handling more inline with aspnetcore patterns.
 2021-06-25 10:29:18 -06:00
Bjarke Berg
d92bfb48c0 Tell pipeline it is using UmbracoBuild 2021-06-25 15:25:00 +02:00
Bjarke Berg
d60213a2f0 Added msbuild targets - 
Before build:
* build belle
* generate json schema

After clean:
* Remove belle
* Remove json schema
 2021-06-25 15:19:07 +02:00
Bjarke Berg
7449bf2947 Clean up 2021-06-25 10:56:49 +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
Bjarke Berg
b80d72555f Merge remote-tracking branch 'origin/v9/dev' into v9/cyclehack/autogeneration_of_json_schema 2021-06-25 08:49:41 +02:00
Bjarke Berg
2e3239ce6b Fix Benchmark project 2021-06-25 08:45:03 +02:00
Bjarke Berg
b1b677f8d3 Merge remote-tracking branch 'origin/v9/dev' into v9/cyclehack/autogeneration_of_json_schema 2021-06-25 08:18:39 +02:00
Bjarke Berg
3baafbe230 Merge pull request #10530 from umbraco/v9/task/v8-chad-merge 
This is a merge PR which merges in #8376 to v9
 2021-06-25 08:14:04 +02:00
Shannon
91547dda75 Fix UrlHelperExtensions to use correct base path 2021-06-24 16:38:13 -06:00
Shannon
c7ad4a8d82 Fixes the acceptance tests "Content with contentpicker" 2021-06-24 13:36:54 -06:00
Shannon
3d5d04550a fix broken migration abstraction, fixes restart after upgrade so the runtimestate is correct, fixes sql alter column migration to actually run if its nullable. 2021-06-24 13:35:57 -06:00