yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,571 Commits 4 Branches 7 Tags
0bc843b06de08c2e5cc3f2a2a64364a8e57ee482
Commit Graph

69 Commits

Author SHA1 Message Date
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
d2443ea4c0 AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff. 2020-01-07 13:08:21 +01: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
Bjarke Berg
439048bc4f Merge pull request #7380 from AndyButland/feature/7371-short-string-helper 
.NET Core transition: Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection (#7371)
 2020-01-07 09:05:28 +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
0670caee15 Populated user and member password configuration from settings file. 2019-12-23 14:35:39 +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
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +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
f9286d1eda Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files 
# Conflicts:
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
 2019-12-12 09:13:40 +01:00
Bjarke Berg
becce7800b Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 14:12:06 +01:00
Bjarke Berg
82bb1f00fc AB4079 - Review fixes 2019-12-06 09:49:28 +01:00
Bjarke Berg
d2bf64195e Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web 
# Conflicts:
#	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
#	src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2019-12-04 11:51:12 +01:00
Shannon
d7fa5f0b66 Removes membership providers stuff from back office, removes all old legacy rules for passwords and membership providers. 2019-12-03 15:28:55 +11:00
Bjarke Berg
2fc50c5730 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web 
# Conflicts:
#	src/Umbraco.Core/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
#	src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
#	src/Umbraco.Tests/Services/MemberServiceTests.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
#	src/Umbraco.Web/Security/UmbracoMembershipProviderBase.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2019-11-26 11:51:50 +01:00
Bjarke Berg
323a60fa76 Removed IOHelper.Default, to prepare for injecting 2019-11-26 08:15:00 +01:00
Shannon
1136e15a27 kill user membership provider, adds some passwords api abstractions, moves membership provider logic out of Core/services, removes membership scenario and other membership code we don't want anymore. 2019-11-25 21:20:00 +11:00
Shannon
3dbebfb153 Refactors the usage of ICultureDictionary so its injectable, removes more uses of Current, removes unused methods relying on System.Web 2019-11-22 13:13:19 +11:00
Bjarke Berg
13507c0e13 AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭) 2019-11-08 07:51:14 +01:00
Benjamin Carleski
e495faf83c Fix FIPS compliance, add FIPS tests (#5978) 2019-08-07 19:31:08 +02:00
Shannon
09793a1744 Fixes tests 2019-07-02 11:07:59 +10: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
Stephan
b260c18056 Refactor IContent vs IContentType 2019-02-06 13:06:31 +01:00
Shannon
c5819ca702 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
 2019-02-04 12:42:07 +11:00
Bjarke Berg
bfc2d53fa4 Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
 2019-02-01 12:52:20 +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
Shannon
7b55d2f1b2 New IMacroRenderer and ITemplateRenderer and hides underlying logic for these in internal classes. Massively cleans up the macro rendering logic (almost makes sense now), removes unused macro code, injects UmbracoHelper wherever it's needed (not creating manually), fixes UmbracoHelper to have it's services injected, no more empty services, allows setting the AssignedContentItem on the UmbracoHelper and ensures it's lifespan is Transient, updates all corresponding ctors. Fixes macro rendering, ensures the correct culture variation is assigned, and that we can render macros for any given IPublishedContent, not just the one assigned in the request. 2019-01-31 15:09:31 +11:00
Chris Houston
193e24afd2 Fixing all the TODO, FIXME & HACK comments so they all follow the same layout. 2019-01-27 11:16:00 +01:00
Bjarke Berg
0330be4e6b Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
 2019-01-11 08:29:29 +01:00
Bjarke Berg
eda46a16d0 Changed IContentType on IContent to a more simple class with lesser properties 2019-01-03 09:27:52 +01:00
Stephan
bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00
Stephan
b0eb0d1205 Fix tests 2018-12-20 15:36:12 +01:00
Stephan
7f8eeeab83 Merge branch temp8 into temp8-di2690 2018-12-07 16:12:08 +01:00
Stephan
d1ab980048 Cleanup 2018-12-07 13:44:41 +01: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
6ffc340725 Merge branch temp8 into temp8-di2690 2018-11-23 14:58:08 +01:00
Shannon
496ecf5c9a Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues 2018-11-15 15:24:09 +11:00
Shannon
bae9bb6108 Initial cleanup of IActions, menu items, etc... 2018-10-29 17:27:33 +11:00
Stephan
7e68f4724f Fix merge 2018-09-07 09:32:42 +02:00
Stephan
725fe61f91 Merge branch temp8 into temp8-di2690 2018-09-06 16:22:13 +02:00
Shannon
729177ffef Fixes issue with not showing validation errors in the dialogs when creating content and saving/publishing when the names haven't been filled out, adds unit tests to support. 2018-09-06 20:33:32 +10:00
Shannon
20c0185ddf Adds unit tests for content controller 2018-09-06 17:37:47 +10:00
Stephan
6692f3e7b7 Post-merge fixes 2018-08-29 19:02:35 +02:00