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 |
|
Bjarke Berg
|
9f56aa1358
|
Merge remote-tracking branch 'origin/netcore/dev' into feature/7898-netcore-model-unit-tests-3
|
2020-04-16 19:28:05 +02:00 |
|
Bjarke Berg
|
3406bdb40b
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# NuGet.Config
# src/Umbraco.Core/Models/RelationType.cs
# src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
|
2020-04-16 19:00:51 +02: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 |
|
Shannon
|
52ecd59c11
|
fixes test
|
2020-04-17 00:01:26 +10:00 |
|
Shannon
|
3310ef9d8d
|
fix tests
|
2020-04-16 23:53:52 +10:00 |
|
Shannon
|
d2c05bf681
|
Fixes issue with RelationTypeFactory swapping the parent/child
|
2020-04-16 22:27:05 +10:00 |
|
Andy Butland
|
2278b0d318
|
Merge branch 'netcore/dev' into feature/7898-netcore-model-unit-tests-3
|
2020-04-16 12:19:04 +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 |
|
Andy Butland
|
a9a8cb7f6f
|
Migrated macro unit tests to new project and builder pattern.
|
2020-04-13 19:22:31 +02:00 |
|
Andy Butland
|
3085ce52f9
|
Migrated parth validation tests to new project and builder pattern.
|
2020-04-11 17:21:27 +02:00 |
|
Andy Butland
|
4456a784b0
|
Migrated user extension tests new project pattern.
|
2020-04-11 16:41:28 +02:00 |
|
Andy Butland
|
b3fd94e023
|
Migrated user tests into new project and builder pattern.
|
2020-04-11 16:35:33 +02:00 |
|
Andy Butland
|
f4ad8176c4
|
Removed references to moved projects introduced by merge.
|
2020-04-10 17:51:57 +02:00 |
|
Andy Butland
|
766826f462
|
Merge branch 'netcore/dev' into feature/netcore-model-unit-tests-2
# Conflicts:
# src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
|
2020-04-10 17:11:41 +02:00 |
|
Andy Butland
|
82feb93243
|
Merge branch 'netcore/dev' into feature/netcore-model-unit-tests-2
|
2020-04-10 17:05:46 +02:00 |
|
Bjarke Berg
|
8aaff38a6d
|
Merge pull request #7895 from AndyButland/feature/netcore-model-unit-tests
Netcore: Further model unit test migrations into new project and builder pattern
|
2020-04-10 16:28:19 +02: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 |
|
Andy Butland
|
d9f9a166a6
|
Migrated property, property type and property group tests into new project and builder pattern.
|
2020-04-04 16:49:01 +02:00 |
|
Andy Butland
|
f10971efaa
|
Migrated relation tests into new project and builder pattern.
|
2020-04-04 12:21:41 +02:00 |
|
Andy Butland
|
58a1bc0a8f
|
Migrated stylesheet and template tests into new project and builder pattern.
|
2020-04-04 09:32:23 +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
|
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
|
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
|
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
|
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
|
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 |
|
Andy Butland
|
374147d5e8
|
Merge branch 'netcore/dev' into netcore/unit-test-migration-member-models
|
2020-03-31 16:35:09 +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 |
|
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 |
|
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 |
|
Bjarke Berg
|
ffc6ce6553
|
AB#8522 - Smidge implementation of the Runtime Minifier
|
2020-03-30 21:27:35 +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
|
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 |
|
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 |
|
Bjarke Berg
|
219391246d
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation
|
2020-03-30 07:23:44 +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 |
|