yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
0f0c50b56e266010305310e90df61bf59cbd96b2
Umbraco-CMS/src
History
Shannon 0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
2020-12-02 13:14:47 +11:00
..
ApiDocs
…
Umbraco.Configuration
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-11-30 11:24:24 +01:00
Umbraco.Core
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Examine.Lucene
Merge branch 'netcore/netcore' into netcore/feature/msdi-remove-composition
2020-11-24 12:05:32 +00:00
Umbraco.Infrastructure
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.ModelsBuilder.Embedded
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Umbraco.Persistance.SqlCe
…
Umbraco.PublishedCache.NuCache
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Umbraco.TestData
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Umbraco.Tests
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Tests.AcceptanceTest
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
Umbraco.Tests.Benchmarks
…
Umbraco.Tests.Common
Added TestEnvironment
2020-11-30 08:51:12 +01:00
Umbraco.Tests.Integration
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Tests.Shared
…
Umbraco.Tests.UnitTests
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web.BackOffice
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web.Common
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web.UI
post merge - fix more issues in legacy csproj
2020-12-01 20:20:47 +01:00
Umbraco.Web.UI.Client
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web.UI.Docs
Styling all code elements in backoffice UI docs
2020-11-17 08:03:43 +10:00
Umbraco.Web.UI.NetCore
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
2020-12-02 13:14:47 +11:00
Umbraco.Web.Website
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
2020-12-01 11:34:13 +01:00
SolutionInfo.cs
Bump version to 8.9.1
2020-11-04 11:22:47 +01:00
umbraco-netcore-only.sln
Added netcore-only solution file
2020-11-18 16:46:59 +01:00
umbraco.sln
…
umbraco.sln.DotSettings
…