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

10840 Commits

Author SHA1 Message Date
Bjarke Berg
c0ec1bf6ca Introduced GenericDictionaryRequestAppCache, to use the HttpContext.Items from .NET Core 2020-04-20 13:21:09 +02:00
Bjarke Berg
bf1784f9d1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
 2020-04-17 11:43:04 +02:00
Shannon
d1524cdafe Merge branch 'v8/dev' into v8/bugfix/7868-nucache-null-parent 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
 2020-04-17 15:04:10 +10:00
Bjarke Berg
d2f361e816 Merge remote-tracking branch 'origin/v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-16 18:54:45 +02:00
Sebastiaan Janssen
41f98a41fb Added fix from #7832 since the test was somehow cherry picked into 8.6.1 already 2020-04-16 14:58:56 +02:00
Shannon Deminick
4a071f6e05 Nucache NullReferenceException when copying (#7961) 
(cherry picked from commit b30db05cc7)

# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-15 20:55:11 +02:00
Bjarke Berg
ad4bce3b73 AB#5819 - Cleanup 2020-04-14 16:26:01 +02:00
mattchanner
d0eee32f1d Added null check on raw JSON to prevent null reference error deserializing the grid 
(cherry picked from commit bcea0f645a)
 2020-04-09 16:51:02 +02:00
Benjamin Carleski
5f5773b0c0 7879: Handle for multiple picked media relations 
(cherry picked from commit 9f7c44c64e)
 2020-04-09 16:50:41 +02:00
Shannon
d56867757c Merge branch 'netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-08 15:59:00 +10:00
Shannon
f19e18e160 Removes new namespaces: Umbraco.Core.Cookie, Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should be part of one namespace 2020-04-08 15:56:19 +10:00
Shannon
36c9cd47a1 Adds notes 2020-04-08 11:22:15 +10:00
Shannon
d54eed5cb9 argh! can't use switch expressions in v8 2020-04-08 10:54:48 +10:00
Shannon
49c6fd2c76 data integrity report working 2020-04-08 10:38:02 +10:00
Shannon
19f0793cba updates health check 2020-04-07 17:38:40 +10:00
Shannon
18d9ad3c73 udpates health check and service methods to be flexible for data integrity checks, fixes tests 2020-04-07 16:42:21 +10:00
Shannon
4b467bf470 Creates data integrity health checks 2020-04-07 01:02:08 +10:00
Shannon
50e9f79ae6 Adds a null check if things are out of order when building up the tree/linked list 2020-04-06 23:10:52 +10:00
Bjarke Berg
7c87ec3141 Merge remote-tracking branch 'origin/netcore/feature/AB5822-smidge-implementation' into netcore/feature/ab5819-initialize-composers 2020-04-03 10:12:10 +02:00
Bjarke Berg
2c1d94cb11 AB#5822 - removed IIOHelper.DirSepChar and uses Path.DirectorySeparatorChar instead 2020-04-03 10:09:08 +02:00
Shannon
d711796c59 Fixing tests 2020-04-03 17:05:50 +11:00
Shannon
c48f36f6a2 Even more IOHelper reduction, fixes some tests 2020-04-03 15:36:57 +11:00
Shannon
4349115f0d Fixes up some errors 2020-04-03 11:47:38 +11:00
Shannon
7e2d0902af Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment 2020-04-03 11:03:06 +11:00
Shannon
1224c97f07 Don't pass in Root to ToAbsolute there's no need 2020-04-03 09:17:40 +11:00
Shannon
fa2e9c3715 Fixing AspNetCoreHostingEnvironment, cleaning up more IOHelper, adds notes 2020-04-03 09:13:55 +11:00
Shannon
9d320f79da New IRuntimeHash to fix type scanning in netcore in order to look at the right runtime bits to creaet a hash for 2020-04-03 01:08:52 +11:00
Shannon
f0579714e9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	.gitignore
#	src/Umbraco.Core/IO/IIOHelper.cs
 2020-04-02 22:32:02 +11:00
Shannon
4fddb94462 Fixes up preview paths, adds more docs and ensures we throw exceptions when not absolute paths 2020-04-02 22:11:57 +11:00
Shannon
4eb116d4ac removes CssInitialization and JsInitialization and merges/simplifies code 2020-04-02 21:29:48 +11:00
Shannon
95a36b3064 Changes namesspace, fixes cdf registrations, fixes bundle registrations, cleanup 2020-04-02 21:19:42 +11:00
Bjarke Berg
01957b7c64 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/integration-tests-running 2020-04-02 10:01:57 +02:00
Shannon
a67bb197b7 Merge branch 'netcore/feature/AB5822-smidge-implementation' of https://github.com/umbraco/Umbraco-CMS into netcore/feature/AB5822-smidge-implementation 2020-04-02 17:41:19 +11:00
Shannon
32deaa12d2 Removes unneeded methods/properties in abstraction, removes unneeded usages of it, changes everything to pre-defined bundles, fixes cdf implementation and reduces reflection, renames namespace 2020-04-02 17:41:00 +11:00
Bjarke Berg
97cf099f9f AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 20:00:27 +02:00
Bjarke Berg
38c41fa0bd Merge branch 'netcore/feature/AB5822-smidge-implementation' into netcore/feature/ab5819-initialize-composers 2020-04-01 15:57:07 +02:00
Bjarke Berg
b1d214a13d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
 2020-04-01 15:52:23 +02:00
Bjarke Berg
3aa849fff2 AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 15:50:46 +02:00
Bjarke Berg
e3ac778fc9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
#	src/Umbraco.Web/Macros/MacroRenderer.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
 2020-04-01 12:44:53 +02:00
Shannon
c9c8693560 removes one null check, adds notes 2020-04-01 13:13:15 +11:00
Shannon
f1b398fab6 Adds some null checks, need to see if tests pass 2020-04-01 11:06:21 +11:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
d0938913e9 Merge pull request #7839 from umbraco/netcore/feature/ab5820-webprofiler-aspnetcore 
NetCore: Implement the WebProfiler for asp.net core.
 2020-03-31 15:10:18 +02:00
Bjarke Berg
b9ad6a0b7c AB#5820 - Cleanup 2020-03-31 15:02:02 +02:00
Bjarke Berg
2a2903f932 AB#5820 - Review fixes / Clean up 2020-03-31 12:22:11 +02:00
Shannon
8535d0fbe3 Cleans up IIOHelper and removes methods/props that shouldn't exist, changes test helper to use WorkingDirectory fixes some usages of MapPath 2020-03-31 17:27:51 +11:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Olivier Bossaer
5fad35d0ee Fix #7521 - Runtime error if removing email notificationMethod 2020-03-30 08:12:19 +02:00
Bjarke Berg
219391246d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 2020-03-30 07:23:44 +02:00
Bjarke Berg
2fc2166767 AB#5820 - Clean up 2020-03-30 07:14:22 +02:00