Commit Graph

39 Commits

Author SHA1 Message Date
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
Bjarke Berg
2b4dfbca9d #8142 - Small cleanup, and bugfix 2020-05-20 11:42:23 +02:00
Bjarke Berg
8f7c022f2d AB#6233 - Handle ApplicationUrl 2020-05-07 09:34:16 +02:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Scott Brady
57ec84cb47 Basic tests & refactor for PostUnlockUsers 2020-05-04 18:19:24 +01:00
Shannon
7e2d0902af Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment 2020-04-03 11:03:06 +11:00
Andy Butland
b67c3dfa04 Moved IImageUrlGenerator and implementation into more appropriate enamespace 2020-03-24 09:37:46 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
cb0994a929 Cleaned up config for Security settings 2020-03-12 14:36:25 +01:00
Elitsa Marinovska
84f19e093a NetCore: Refactor internal usages of UmbracoHelper (#7744)
* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods

* Removed UmbracoHelper from UmbracoApiControllerBase

* Removed UmbracoHelper references

* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality

* Fixed tests referencing UmbracoHelper

* Adding Media methods back

* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests

* Reintroduced some methods..

* Reintroduced some methods..

* Reintroducing last missing bits

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-03-03 11:59:17 +01:00
Bjarke Berg
c9b970e872 Using the ServiceContext from the baseclass instead of Current.Services in tests (#7644) 2020-02-24 11:27:02 +01:00
Bjarke Berg
c6e1e7b3e5 Untangled UrlProvider from UmbracoContext 2020-02-14 13:06:10 +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
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
14f0005345 Fixed issue with the smtp settings.. Found when testing smtp healthcheck 2020-01-29 13:15:31 +01:00
Benjamin Carleski
fd3ef48367 Use dependency injection for config classes 2020-01-21 17:25:03 -08:00
Benjamin Carleski
fceac19f04 Update controllers to include UmbracoMapper 2020-01-20 14:15:54 -08:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
2020-01-07 09:46:42 +01:00
Andy Butland
bd5b344a57 Merge branch 'netcore/dev' into feature/7371-short-string-helper
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/TypeExtensions.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web/Editors/CodeFileController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MacroRenderingController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
2019-12-24 09:08:47 +01:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Bjarke Berg
d5527f0485 AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead 2019-12-19 10:43:34 +01:00
Bjarke Berg
7f9fbe9877 AB4227 - Removed StringExtensions from core.. 2019-12-18 18:55:00 +01:00
Bjarke Berg
6c923bc9b4 AB4227 - Moved a mix of files 2019-12-18 13:42:33 +01:00
Bjarke Berg
becce7800b Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 14:12:06 +01:00
Benjamin Carleski
e495faf83c Fix FIPS compliance, add FIPS tests (#5978) 2019-08-07 19:31:08 +02:00
Stephan
27e145fe3d Fix temporal coupling 2019-04-02 13:35:01 +02:00
Stephan
961cbf694e Simplify our Poco mappers 2019-03-29 09:46:36 +01:00
Bjarke Berg
1770a0abec Inject IUmbracoContextAccessor instead of UmbracoContext 2019-02-14 12:40:45 +01:00
Shannon
c2ff32aaab Fixing tests, don't expose UmbracoContext on UmbracoHelper, fixing all of the editor constructors 2019-02-01 15:24:07 +11:00
Stephan
c6891c6c70 RegisterUnique 2018-11-29 10:35:16 +01:00
Stephan
f9a19ada04 IContainer.die.die.die 2018-11-28 12:59:40 +01:00
Stephan
97da0829a2 Refactor collection builders for IContainer 2018-07-20 16:36:46 +02:00
Stephan
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00
Stephan
0d22478186 Port v7@2aa0dfb2c5 - WIP 2018-03-27 17:59:53 +02:00
Stephan
dda696bde5 Troubleshoot, fix 2018-03-16 09:11:59 +01:00
Stephan
c43bf6c741 Get tests green 2017-09-22 15:23:46 +02:00
Stephan
dca3b74542 Refactor and fix tests 2017-09-20 20:06:46 +02:00
Stephan
9ed6576908 Port 7.7 - WIP 2017-09-19 15:51:47 +02:00
Stephan
d9aaba192c Port 7.7 - WIP 2017-09-14 19:29:12 +02:00