Bjarke Berg
|
35443f0e71
|
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
|
2020-09-24 08:24:35 +02:00 |
|
Bjarke Berg
|
0d731e7a40
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# build/build-bootstrap.ps1
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
# src/Umbraco.Web/Logging/WebProfilerComponent.cs
|
2020-09-23 13:28:36 +02:00 |
|
Bjarke Berg
|
e3c8bd8ced
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Cache/MemberCacheRefresher.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
|
2020-09-23 12:54:13 +02:00 |
|
Mole
|
20e12c7596
|
Use MS ILogger in Services
|
2020-09-18 15:27:38 +02:00 |
|
Shannon
|
d444dfd441
|
Moves ContentTypeBase, Member, ContentTypeComposition, etc... removes the casting
|
2020-05-20 11:33:10 +10: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
|
0b49c2d84e
|
Removed a few duplicated comments.
|
2020-02-15 09:37:57 +01:00 |
|
Bjarke Berg
|
c6c0d7df54
|
AB4234 - Moved stuff from core into web, that used identity.
|
2020-01-07 13:50:38 +01:00 |
|
Bjarke Berg
|
da1cf259c6
|
AB4227 - Moved Services and Migration
|
2019-12-18 13:42:29 +01:00 |
|