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

38687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
d6a6016801 implement noop published snapshot service, splits tests models for published content, fixes sqlce image mapper to not have circular ref. 2021-06-24 10:25:23 -06:00
Shannon
72671dbca8 Merge commit '94d525d88f713b36419f28bfda4d82ee68637d83' into v9/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
#	src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataModel.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializationResult.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/LazyCompressedString.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
#	src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComposer.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Composing/ModuleInjector.cs
#	src/Umbraco.Web/Editors/NuCacheStatusController.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Runtime/WebRuntime.cs
 2021-06-24 09:43:57 -06:00
Warren Buckley
b0f55bab69 Specify the outputFile argument in powershell build as path is relative to the build folder when run from there 2021-06-24 14:33:33 +01:00
Bjarke Berg
cc99c3be16 Added forms config 2021-06-24 15:18:00 +02:00
Bjarke Berg
f7bbef6efb Moved prepare json step 2021-06-24 14:55:16 +02:00
Bjarke Berg
a071969fd2 More clean 2021-06-24 14:49:11 +02:00
Warren Buckley
f2fd100267 Merge branch 'v9/cyclehack/autogeneration_of_json_schema' of https://github.com/umbraco/Umbraco-CMS into v9/cyclehack/autogeneration_of_json_schema 2021-06-24 13:37:24 +01:00
Warren Buckley
8b5fd0aa6e Update Azure pipeline for Build Artifacts to generate the JSON schema before needed in Nuget Packages 2021-06-24 13:37:20 +01:00
Warren Buckley
8bc3425910 Update Powershell build script 
Runs dotnet run on the console app to genetate the schema & default location
 2021-06-24 13:34:42 +01:00
Bjarke Berg
a36489e8d3 Clean up + async fix 2021-06-24 13:37:57 +02:00
Bjarke Berg
69cc340c5a Merge with official schema 2021-06-24 13:24:57 +02:00
Warren Buckley
f402c8151a Updated dotnet new templates appsettings to our local stored JSON schema in Umbraco 2021-06-24 11:52:29 +01:00
Bjarke Berg
b3b0c44deb Added schema by default and reference it from the appsettings files. 
+ Do not suggest null values instead of objects
 2021-06-24 10:06:57 +02:00
Bjarke Berg
16ada8a63f Merge remote-tracking branch 'origin/v9/cyclehack/autogeneration_of_json_schema' into v9/cyclehack/autogeneration_of_json_schema 2021-06-24 09:58:53 +02:00
Bjarke Berg
88bd437fce Default path and write to console location of file 2021-06-24 09:58:38 +02:00
Warren Buckley
cb1676cbc8 Merge remote-tracking branch 'origin/v9/cyclehack/autogeneration_of_json_schema' into v9/cyclehack/autogeneration_of_json_schema 2021-06-24 08:55:42 +01:00
Warren Buckley
bcbf71d87a Added an ignore for Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json 
The console app and build script will generate this at build and ship it with Nuget releases
 2021-06-24 08:54:04 +01:00
Bjarke Berg
e439ebcd1d Refactor 2021-06-24 09:45:52 +02:00
Bjarke Berg
5a754e7e24 Fixes comment, that would break the schema. 2021-06-24 08:56:33 +02:00
Bjarke Berg
74e2b7aca2 Refactored the initialization of settings and started a json schema project 2021-06-24 08:47:37 +02:00
Warren Buckley
4c89d036ac Merge pull request #10519 from umbraco/v9/bugfix/10394_nucache_rebuild_issue 
V9: Fixes issue with "Rebuild" nucache not doing anything
 2021-06-23 13:33:58 +01:00
Bjarke Berg
df43b87f43 https://github.com/umbraco/Umbraco-CMS/issues/10394 - Fixes issue with "Rebuild" not really doing anything, because the "null" injected was not handled like "All", but instead ignored the type. 2021-06-23 11:31:08 +02:00
Bjarke Berg
cc495d66b1 Merge pull request #10512 from bjarnef/v9/feature/grid-partial-async 
Render grid editor partial async
 2021-06-23 10:45:40 +02:00
Bjarke Berg
8dc2cb3b52 Merge pull request #10511 from bjarnef/v9/feature/block-list-partial-async 
Render Block List component partial async
 2021-06-23 10:30:58 +02:00
Shannon
88ef1e081f merges v8 healthcheck changes from #5557 into netcore branch. 2021-06-22 15:02:34 -06:00
Shannon Deminick
74e12b5c3d Merge pull request #10509 from umbraco/v9/feature/updated_nuget_dependencies 
V9: Updated nuget dependencies
 2021-06-23 04:21:33 +10:00
Bjarne Fyrstenborg
83eed4c70f Formatting 2021-06-22 19:49:11 +02:00
Bjarne Fyrstenborg
44e9fb92e8 Adjust some whitespace 2021-06-22 19:42:42 +02:00
Bjarne Fyrstenborg
a7c5bdafe4 Render base grid editor partial async 2021-06-22 19:37:46 +02:00
Bjarne Fyrstenborg
ff65a333e1 Render grid partials async 2021-06-22 19:33:48 +02:00
Bjarne Fyrstenborg
b0657318c3 Render Block List component partial async 2021-06-22 19:07:24 +02:00
Bjarke Berg
1775b21591 Updated nuget dependencies 2021-06-22 15:41:24 +02:00
Bjarke Berg
c41d05f6a6 Merge remote-tracking branch 'origin/v9/9.0-beta004' into v9/9.0-beta004 2021-06-21 22:23:24 +02:00
Shannon Deminick
8cf8fb43a4 Merge pull request #10503 from umbraco/v9/task/smidge-update 
Updates to latest smidge and changes how debug assets work
 2021-06-22 06:22:03 +10:00
Shannon
a0cc6d904c Updates to latest Examine on nuget 2021-06-21 14:17:17 -06:00
Shannon
d818d3bc36 Updates to latest smidge and changes how debug assets work 2021-06-21 13:51:57 -06:00
Bjarke Berg
1b1a1f1f59 Fixed issue with MemberPicker not working if searching for specific member types. 2021-06-21 21:47:40 +02:00
Bjarke Berg
ff99e6c6fd https://github.com/umbraco/Umbraco-CMS/issues/10461 Removes hardcoded "Default" from view 2021-06-21 09:08:25 +02:00
Bjarke Berg
43af29f139 Merge pull request #10393 from umbraco/v9/feature/email-display-name-in-notifiaction 
V9: Add new email Model for notifications
 2021-06-17 15:39:14 +02:00
Mole
5822af4510 Merge pull request #10489 from umbraco/v9/bugfix/fixed_extension_methods_to_use_IHtmlHelper_instead_of_HtmlHelper 
Moves extension methods from HtmlHelper to IHtmlHelper
 2021-06-17 15:33:24 +02:00
Bjarke Berg
5eb9473657 https://github.com/umbraco/Umbraco-CMS/issues/10479 
https://github.com/umbraco/Umbraco-CMS/issues/10427

fixes issue with with saving data types
 2021-06-17 14:55:36 +02:00
Bjarke Berg
2bbaec6c2a Merge pull request #10491 from umbraco/v9/feature/v8_dev_latest 
V9: Merge v8/dev
 2021-06-17 14:53:08 +02:00
Bjarke Berg
97a2318db2 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
 2021-06-17 14:01:32 +02:00
Bjarke Berg
6a35e0c62b Moves extension methods from HtmlHelper to IHtmlHelper 2021-06-17 11:04:16 +02:00
Mads Rasmussen
585f7bb571 Make dashboards support deep linking (#10283) 
Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-06-17 09:40:07 +02:00