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

33227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
6430137fe3 AB#5822 Clean up 2020-03-31 16:35:17 +02:00
Bjarke Berg
8d2aad5f49 AB#5822 Clean up 2020-03-31 16:28:58 +02:00
Bjarke Berg
c75c86ab27 AB#5822 Clean up 2020-03-31 16:28:13 +02:00
Bjarke Berg
94f4c6b372 AB#5822 Clean up 2020-03-31 16:15:55 +02: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
ab57b633e0 AB#5820 - Cleanup 2020-03-31 14:53:20 +02:00
Bjarke Berg
2e6b5004f7 AB#5820 - Bugfix 2020-03-31 13:04:21 +02:00
Bjarke Berg
12a957e9b6 AB#5820 - Copy client files into both netcore and framework executables 2020-03-31 12:59:10 +02:00
Bjarke Berg
2a2903f932 AB#5820 - Review fixes / Clean up 2020-03-31 12:22:11 +02:00
Bjarke Berg
a6d43f4fd5 AB#8522 - Clean up 2020-03-31 10:57:56 +02:00
Bjarke Berg
117bfd1f12 AB#8522 - Smidge reset updates the version string to the current ticks 2020-03-31 10:47:08 +02:00
Shannon Deminick
31bd20e54a Merge pull request #7669 from AndyButland/netcore/7668-remove-repository-concerns-from-services 
.NetCore: Remove direct database queries from services
 2020-03-31 14:39:15 +11:00
Shannon Deminick
4cf618e358 Merge pull request #7837 from AndyButland/feature/7540-use-image-url-generator-back-office 
Netcore: Use API to get Image URLs in BackOffice instead of hardcoded querystrings
 2020-03-31 14:38:23 +11:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Elitsa Marinovska
4ac8ae3b15 Removing specific to each machine file paths from project 2020-03-30 15:29:53 +02:00
Elitsa Marinovska
7e3b3414d5 Merge branch 'netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 2020-03-30 15:26:51 +02:00
Andy Butland
75b216bca5 Removed registerFileResolver methods on image cropper and file upload property editors. 2020-03-30 14:30:50 +02:00
Andy Butland
1760241607 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-30 14:19:15 +02:00
Andy Butland
cdb65762f1 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-30 14:17:16 +02:00
Shannon
7617027c49 Moves most of the UserRepositoryTest 2020-03-30 21:53:30 +11:00
Shannon
3757f722a0 Gets first integration test moved, moves the test options to the common project, ensures that the LocalDb pool is updated on each test 2020-03-30 20:55:13 +11:00
Shannon
9ed925941f Gets DB installation test working with runtime level checking 2020-03-30 17:25:29 +11: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
1e33b3df7a AB#5820 - Clean up 2020-03-30 07:17:56 +02:00
Bjarke Berg
49da01c655 AB#5820 - Clean up 2020-03-30 07:16:55 +02:00
Bjarke Berg
2fc2166767 AB#5820 - Clean up 2020-03-30 07:14:22 +02:00
Bjarke Berg
8ed7ae470a AB#5820 - Clean up 2020-03-30 06:38:39 +02:00
Bjarke Berg
ff5d6770d9 AB#5820 - Clean up and remove unnecessary stuff for this task 2020-03-30 06:34:56 +02:00
Bjarke Berg
b2799ef901 AB#5820 - Added simple controller and view to test the miniprofiler 2020-03-29 22:35:52 +02:00
Andy Butland
5a29365063 Revert change to overridden save method on key value repository. 2020-03-28 15:20:17 +01:00
Andy Butland
8958cf90b9 Moved non-scoped retrieval of key value into an extension method in IUmbracoDatabase. 2020-03-28 15:13:50 +01:00
Andy Butland
f01ccb49dd Removed key value service initialization logic. 2020-03-28 15:04:36 +01:00
Andy Butland
3e40389819 PR review amends on key value model and repository classes. 2020-03-28 15:04:11 +01:00
Andy Butland
bc05370995 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-28 14:31:23 +01:00
Andy Butland
93fd2eb954 Fixed creation of image processing options in grid media controller. 2020-03-28 14:11:24 +01:00
Andy Butland
f48a4b0c72 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-27 21:20:08 +01:00
Bjarke Berg
681a25b861 Moved files from backoffice into Common + Introduced AspNetCoreComponent to invoke the Umbraco Application Init event 2020-03-27 11:39:17 +01:00
Bjarke Berg
fe88662f48 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 2020-03-27 06:04:06 +01:00
Bjarke Berg
a72ae2278d Post merge + bugfix 2020-03-26 19:52:40 +01:00
Bjarke Berg
44e9df949d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Property.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2020-03-26 19:22:09 +01:00
Bjarke Berg
8964ef1c48 Register missing interface 2020-03-26 19:14:02 +01:00
Andy Butland
30567d34d5 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 
# Conflicts:
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-03-26 10:53:24 +01:00
Shannon
d40b7087f4 Fixes issue with deep cloning Property 
main problem was that it was duplicating the _pvalue value when it shouldn't have. The real fix is that the Values property solves all these problems with it's setter but that wasn't being used by the DeepClone engine because that explicitly looks for certain collection types and IReadOnlyCollection wasn't one of them. With that included and PropertyValue marked as IDeepCloneable, it all just works. I've added tests.
 2020-03-26 19:56:21 +11:00
Bjarke Berg
312e1e99b0 Merge remote-tracking branch 'origin/netcore/feature/ab5820-webprofiler-aspnetcore' into netcore/feature/ab5820-webprofiler-aspnetcore 2020-03-26 07:11:58 +01:00
Bjarke Berg
86fe83ca16 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-26 07:10:23 +01:00
Bjarke Berg
402e994e89 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-26 07:04:38 +01:00
Bjarke Berg
405fca7e51 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 2020-03-26 06:55:58 +01:00
Bjarke Berg
6858739086 Fix for old references in new test project 2020-03-26 06:54:21 +01:00