Commit Graph

13 Commits

Author SHA1 Message Date
Mole
738150f5ad Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces
# Conflicts:
#	src/Umbraco.Core/IO/ViewHelper.cs
#	src/Umbraco.Core/Models/ContentModel.cs
#	src/Umbraco.Core/Models/ContentModelOfTContent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/BackOfficeIdentityCultureConvention.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs
#	src/Umbraco.Web.Common/ApplicationModels/UmbracoJsonModelBinderConvention.cs
#	src/Umbraco.Web.Common/Controllers/RenderController.cs
#	src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
#	src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
#	src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
#	src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
2021-02-17 15:35:44 +01:00
Shannon
4f2682678e Gets virtual page routing working, now just need to document. 2021-02-15 18:50:16 +11:00
Mole
55aa2edb72 Align namespaces in Umbraco.Web.Common 2021-02-10 11:42:04 +01:00
Bjarke Berg
a098b956a6 Revert "Revert "Ensures that all back office controllers are authenticated under the back office scheme""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:35:22 +01:00
Bjarke Berg
7d61020214 Revert "Ensures that all back office controllers are authenticated under the back office scheme"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:16:50 +01:00
Shannon
313a2e6f7c Ensures that all back office controllers are authenticated under the back office scheme 2020-11-27 13:32:41 +11:00
Shannon
1239975b07 Ensures all back office controllers have the thread culture set, we do this with a new application model targeting all back office controllers. 2020-08-06 22:08:27 +10:00
Bjarke Berg
8400b53f70 Cleanup based on review
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-06 12:55:23 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-17 16:39:28 +02:00
Bjarke Berg
c3606b31ce https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Clean up and fixed issue with Ambiguous actions 2020-05-28 15:20:02 +02:00
Bjarke Berg
e879c5c7d9 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Migrated CodeFileController 2020-05-26 13:08:20 +02:00
Shannon
3add4746fe Gets body model binders working per controller and figures out how the application model works 2020-05-12 12:29:03 +10:00
Shannon
39fed867c1 Cleans up some routing, mvc base classes, gets controller specific model binding working, applies our own application model to our controllers 2020-05-12 10:21:40 +10:00