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

33282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
400fa1ccd4 Initialize Current 2020-04-01 14:19:41 +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
Bjarke Berg
407d26635c Merge pull request #7872 from umbraco/netcore/feature/builders 
NetCore: Aligned User and UserGroup builders to the other builders
 2020-04-01 12:09:50 +02:00
Bjarke Berg
944042ad61 Updated builders 2020-04-01 12:07:54 +02:00
Bjarke Berg
6012d6749e Fix views 2020-04-01 11:31:21 +02:00
Bjarke Berg
9e38ed045f Aligned builders 2020-04-01 08:18:56 +02:00
Bjarke Berg
b45c2f9412 Merge pull request #7855 from AndyButland/netcore/unit-test-migration-member-models 
Netcore: Migrated member unit tests into new project/builder pattern
 2020-04-01 06:33:09 +02:00
Shannon
5fc889a8a5 Merge tag 'release-8.6.0' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-04-01 10:40:35 +11:00
Andy Butland
919861bf36 Separated member and member group builder and model unit tests, and other minor updates from PR review. 2020-03-31 17:37:34 +02:00
Bjarke Berg
e42c63693f AB#5822 Clean up 2020-03-31 16:43:01 +02:00
Bjarke Berg
6430137fe3 AB#5822 Clean up 2020-03-31 16:35:17 +02:00
Andy Butland
374147d5e8 Merge branch 'netcore/dev' into netcore/unit-test-migration-member-models 2020-03-31 16:35:09 +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
Sebastiaan Janssen
8cba80913a Remove generated files from git and ignore them 2020-03-30 13:38:17 +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
Sebastiaan Janssen
1dbf5463b8 Merge branch 'v8/contrib' into v8/dev 2020-03-30 09:59:51 +02:00
Shannon
9ed925941f Gets DB installation test working with runtime level checking 2020-03-30 17:25:29 +11:00
Olivier Bossaer
5fad35d0ee Fix #7521 - Runtime error if removing email notificationMethod 2020-03-30 08:12:19 +02:00
Andy Butland
f6af286e0b Added tests confirming correct building of unit test objects. 2020-03-30 07:42:02 +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
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
dface90de7 Migrated member unit tests to new unit test project using builder pattern. 2020-03-29 16:17:06 +02:00