yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,664 Commits 4 Branches 7 Tags
30b0f142eb6e564d6a450c0cb4586d9ff072d287
Commit Graph

45 Commits

Author SHA1 Message Date
Bjarke Berg
e9597c0f3f https://github.com/umbraco/Umbraco-CMS/pull/8948 - Injecting UploadAutoFillProperties instead of newing it up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 21:24:12 +02:00
Andy Butland
c3c8d79720 Merge branch 'netcore/netcore' into feature/8651-config-options-patten 2020-08-24 09:45:25 +02:00
Andy Butland
7884e4ca17 Resolved issues such that application boots and back-office is navigable. 2020-08-24 09:29:40 +02:00
Andy Butland
2cd91a5a54 Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services. 
Further amends to return to booting application.
 2020-08-23 23:36:48 +02:00
Bjarke Berg
b288c99e56 Register noop examine implementations in core, to be replaced by examine dll. 2020-08-19 19:42:58 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
f86d8185bf Clean up and based on review comments 2020-06-11 11:21:07 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Bjarke Berg
aa63ce5ed9 Merge branch 'netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2020-05-20 12:43:13 +02:00
Elitsa Marinovska
16d805e6f5 Adding Smtp section in appsettings, registering IEmailSender as an email service and ofc the MailKit nuget in Infrastructure proj 2020-05-20 00:24:55 +02:00
Bjarke Berg
8f7c022f2d AB#6233 - Handle ApplicationUrl 2020-05-07 09:34:16 +02:00
Bjarke Berg
f79526e46a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-04-24 08:23:55 +02:00
Bjarke Berg
f76e638f0d Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/logging-fixing 
# Conflicts:
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
 2020-04-22 10:54:54 +02:00
Bjarke Berg
79e9235338 AB#6233 - Install in .NET Core 2020-04-22 08:17:45 +02:00
Bjarke Berg
ad4bce3b73 AB#5819 - Cleanup 2020-04-14 16:26:01 +02:00
Bjarke Berg
3aa849fff2 AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 15:50:46 +02:00
Andy Butland
f01ccb49dd Removed key value service initialization logic. 2020-03-28 15:04:36 +01:00
Andy Butland
bc05370995 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-28 14:31:23 +01:00
Shannon
612a47b16b Splits interfaces into separate ones, removes overlap between interfaces, injects the necessary bits, and much more 2020-03-25 15:06:22 +11:00
Shannon
919d418920 Gets the DB installing in integration tests, changes integratino tests to use Generic Host builder 2020-03-24 11:53:56 +11:00
Bjarke Berg
00418959f2 Extracted IConfigManipulator from IConnectionStrings, and implemented a XML (legacy) and JSON version. 2020-03-18 19:17:51 +01:00
Bjarke Berg
c1f42a9258 Simplified more config 2020-03-13 20:37:15 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
e27a05c3e8 Cleaned up config for RequestHandler settings 2020-03-12 12:46:08 +01:00
Andy Butland
e21d0870a7 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 
# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
 2020-03-05 07:36:14 +01:00
Bjarke Berg
d1c39a813a Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:46:54 +01:00
Bjarke Berg
e6c315ff69 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Editors/UpdateCheckController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:06:37 +01:00
Bjarke Berg
ca4f0a8057 Merge branch 'netcore/feature/move-files-after-umbraco-context-abstractions' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Models/Mapping/CommonMapper.cs
 2020-02-19 11:40:25 +01:00
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
Bjarke Berg
fb5d4fcb2f Merge branch 'netcore/feature/move-files-after-umbraco-context-abstractions' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
 2020-02-18 14:22:30 +01: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
51f6d30dbc Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
 2020-02-18 11:38:51 +01:00
Bjarke Berg
f254d3754b Moved files from Backoffice to application + clean up 2020-02-18 11:32:31 +01:00
Andy Butland
0bba475533 Amends to key value service/repository to better match existing repository patterns. 2020-02-17 22:12:42 +01:00
Bjarke Berg
43b33f9e6b Move features 
- Introduced IUmbracoFeature
Move Install
Move Tree Items
 - Introduced IMenuItemCollectionFactory - to insure injection of ActionCollection
 2020-02-17 14:58:34 +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
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
51d0f7da94 AB4234 - Fixes namespaces and removed old unused property on user 2020-01-14 07:47:47 +01:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01:00