Commit Graph

32713 Commits

Author SHA1 Message Date
Shannon
13a56eb085 Renames and refactors the MediaUrlGeneratorCollection and ensure that this collection is used wherever IMediaUrlGenerator is needed instead of relying property editors possibly being the implementation. 2020-02-19 16:37:00 +11:00
Shannon
04c620d76e Reverts how UmbracoContextReference works 2020-02-19 15:46:54 +11:00
Shannon
5cb5585574 Removes ICurrentUserAccessor since we don't need it, fixes editorconfig (for now) 2020-02-19 15:38:22 +11:00
Bjarke Berg
5a61b27366 Break cycle by introducing DataEditorWithMediaPathCollection 2020-02-18 13:56:31 +01:00
Bjarke Berg
e6e3fc39fb Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
2020-02-18 11:39:34 +01:00
Bjarke Berg
f254d3754b Moved files from Backoffice to application + clean up 2020-02-18 11:32:31 +01:00
Bjarke Berg
aeca49dddb Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions
# Conflicts:
#	src/Umbraco.Abstractions/PublishedContentExtensions.cs
#	src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
#	src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
2020-02-17 13:07:59 +01:00
Bjarke Berg
2b8be2cf00 Netcore: Move files from Web/Routing to Abstractions/Routing (#7642)
* AB4951 - Move routing files to abstractions

* Changed UriUtility from static to instance

* Moved more files from Routing in web to Abstractions

* Moved UrlProvider to Abstractions

* Moved PublishedRequest to Abstractions
2020-02-17 12:07:51 +01:00
Bjarke Berg
e7e4dc8441 Clean up 2020-02-17 10:07:18 +01:00
Bjarke Berg
f2b1558cb1 Review fixes from comments on https://github.com/umbraco/Umbraco-CMS/pull/7664 2020-02-17 09:04:15 +01:00
Bjarke Berg
7a55852cbb Update editor config to not force private constants to be named _camelCase 2020-02-17 09:02:27 +01:00
Shannon
a69cffffce Merge branch 'netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-17 11:53:08 +11:00
Shannon Deminick
707e11ed69 Merge pull request #7619 from umbraco/netcore/feature/AB4919-untable-umbraco-context
NetCore: Untangle and abstract UmbracoContext
2020-02-17 10:29:18 +11:00
Bjarke Berg
738e374061 Cleanup 2020-02-14 14:03:05 +01:00
Bjarke Berg
0bbd82b262 Removed Url stuff from UmbracoContext 2020-02-14 13:52:51 +01:00
Bjarke Berg
ddfa57e57a Merge remote-tracking branch 'origin/netcore/feature/move-files-after-umbraco-context-abstractions' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-14 13:18:10 +01:00
Bjarke Berg
0372b13495 Merge branch 'netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-14 13:17:55 +01:00
Bjarke Berg
c6e1e7b3e5 Untangled UrlProvider from UmbracoContext 2020-02-14 13:06:10 +01:00
Bjarke Berg
dceb6c80f5 Merge branch 'netcore/feature/AB4919-untable-umbraco-context' into netcore/feature/move-files-after-umbraco-context-abstractions
# Conflicts:
#	src/Umbraco.Web/Security/WebSecurity.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
2020-02-14 09:00:50 +01:00
Bjarke Berg
6ccd63694d Fix merge issue 2020-02-14 08:51:17 +01:00
Bjarke Berg
293a5fbe33 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context
# Conflicts:
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
2020-02-14 08:34:04 +01:00
Bjarke Berg
463a081968 Merge remote-tracking branch 'origin/netcore/feature/AB4919-untable-umbraco-context' into netcore/feature/AB4919-untable-umbraco-context 2020-02-14 08:05:42 +01:00
Shannon
e89096eeb6 Dont call Thread.GetDomain() more than needed 2020-02-14 12:36:22 +11:00
Shannon
31d71ad86e Removes methods/props from interfaces that don't need to be there, removes unused code, obsoletes some code we need to refactor 2020-02-14 12:30:56 +11:00
Shannon Deminick
54af158012 Merge pull request #7650 from umbraco/netcore/feature/clean-up-legacy-alternative-template-stuff
NetCore: Removed legacy way of handling alternative templates..
2020-02-14 11:07:55 +11:00
Bjarke Berg
53a9e75a48 Refactor UmbracoContext to inject IHttpAccessor instead of HttpContext 2020-02-13 15:13:38 +01:00
Bjarke Berg
31130be85a Move files 2020-02-13 12:58:05 +01:00
Bjarke Berg
392828fcb2 Merge branch 'netcore/feature/use-request-cache-instead-of-httpcontext-items' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-13 12:28:50 +01:00
Bjarke Berg
b57a7690f5 Moved More files to infrastructure/abstractions 2020-02-13 11:21:20 +01:00
Bjarke Berg
a69b985002 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context 2020-02-13 09:50:19 +01:00
Bjarke Berg
6ae1f79b5f Moved IUmbracoContextAccessor 2020-02-13 09:44:13 +01:00
Bjarke Berg
04b1e37348 Reintroduced some code that could not be removed 2020-02-13 09:38:16 +01:00
Bjarke Berg
99045eaaa4 Reintroduced some code that could not be removed 2020-02-13 09:17:57 +01:00
Bjarke Berg
a329fb1a92 Replaced HttpContextBase injection with HttpContextAccessor injection 2020-02-13 08:52:58 +01:00
Bjarke Berg
215cb60b15 Refactored usages of HttpContext.IsDebuggerEnabled to use the IHostingEnvironment.IsDebugMode 2020-02-13 07:56:50 +01:00
Bjarke Berg
85afde0ea1 Replaced usages of HttpContext.Items with usages of IRequestCache 2020-02-13 07:46:49 +01:00
Bjarke Berg
0f6c945fe0 Fix tests 2020-02-12 11:12:09 +01:00
Bjarke Berg
6c395db5a5 Removed legacy way of handling alternative templates.. Today we use ContentFinderByUrlAndTemplate 2020-02-12 10:56:23 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
2020-02-11 16:53:13 -08:00
Bjarke Berg
6f32470fdf Cleanup 2020-02-11 11:27:43 +01:00
Bjarke Berg
ec1d829a3e Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context
# Conflicts:
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
#	src/Umbraco.Web/Macros/MacroRenderer.cs
2020-02-11 10:30:41 +01:00
Bjarke Berg
9449ed9a4d Fix views 2020-02-11 10:28:34 +01:00
Bjarke Berg
c76fff9d04 Merge pull request #7618 from AndyButland/netcore/7617-published-content-element-property-extension-methods
Netcore: Migrate various extension methods on IPublishedContent, IPublishedElement and IPublishedProperty to Umbraco.Abstractions
2020-02-11 10:20:10 +01:00
Bjarke Berg
4d15c8c044 Bug fixes for macros 2020-02-10 19:59:47 +01:00
Bjarke Berg
e94921b384 Introduced interface on PublishedRequest and moved interfaces to abstractions 2020-02-10 19:23:42 +01:00
Bjarke Berg
4b9d0941a4 Fix if httpContext is null we cannot wrap it 2020-02-10 15:05:35 +01:00
Bjarke Berg
3dcff69d34 Clean up 2020-02-10 14:40:24 +01:00
Bjarke Berg
d151503dbf Started replacing UmbracoContext.HttpContext with injection of IHttpContextAccessor 2020-02-10 14:22:18 +01:00
Bjarke Berg
ef7af69731 https://github.com/umbraco/Umbraco-CMS/issues/7138 - Injected IIOHelper (#7581)
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2020-02-10 11:23:23 +01:00
Bjarke Berg
aa6a70efba Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context 2020-02-10 09:45:14 +01:00