Commit Graph

441 Commits

Author SHA1 Message Date
Bjarke Berg
1ea39f2762 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs
2020-03-02 08:34:52 +01:00
Shannon
3553bb2aa3 Fixes CollectionBuilder's to ensure that each item in the collection is registered in DI with the same lifetime as the collection itself 2020-02-26 12:12:15 +11:00
Jeavon
5efeb53805 Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700) 2020-02-24 11:11:33 +00:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Shannon
4cf204f8f5 Merge branch 'v8/dev' into v8/feature/media-tracking
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
2020-01-21 13:40:16 +11:00
Warren Buckley
d378495942 Log message format fix for PR6617 2020-01-20 09:11:29 +00:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01: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
Warren Buckley
8b51b7f7ab Commit of suggestion to community PR #6617 that I was unable to directly push back to due to their repo permissions 2020-01-03 15:35:07 +00:00
Warren Buckley
7c53fd4677 Merge pull request #6617 from ronaldbarendse/v8/bugfix/6616-exception-in-component-terminate
Log exceptions thrown while terminating components
2020-01-03 15:31:46 +00: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
6c923bc9b4 AB4227 - Moved a mix of files 2019-12-18 13:42:33 +01:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
2019-12-18 15:28:27 +11:00
Shannon Deminick
62c701d5c3 Merge pull request #6630 from ronaldbarendse/v8/bugfix/6624-enable-disablecomposer-from-all-assemblies
Get EnableComposer and DisableComposer attributes from all assemblies
2019-12-17 06:56:34 +01:00
Ronald Barendse
8b3e2c61af Add obsolete Composers constructor for backwards-compatibility 2019-12-12 13:55:43 +01:00
Bjarke Berg
9e5494cc14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
#	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.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/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
2019-12-11 09:29:36 +01:00
Bjarke Berg
aa15f89275 Merge remote-tracking branch 'origin/v8/feature/media-tracking' into netcore/dev
# Conflicts:
#	src/Umbraco.Abstractions/Models/IDataValueEditor.cs
#	src/Umbraco.Abstractions/Models/RelationType.cs
#	src/Umbraco.Core/Contants-UdiEntityType.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Tests/Models/RelationTests.cs
#	src/Umbraco.Tests/Models/RelationTypeTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
2019-12-10 14:44:42 +01:00
Bjarke Berg
fb562817bc Moved more files to abstractions and eliminated the use of JObject 2019-12-05 14:03:09 +01:00
Bjarke Berg
147626fc08 Refactored the hosting settings out of global settings 2019-12-05 08:31:06 +01:00
Bjarke Berg
28ecb355dd Let IOHelper use IHostingEnvironment 2019-12-04 21:30:18 +01:00
Warren Buckley
9e1a56eba5 Rename from DataValueReferenceFor to DataValyeReferenceFactory & Factories for the plural collection 2019-12-04 16:14:33 +00: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
Bjarke Berg
886a298b3d AB3981 - Review fixes - Moved abstractions into namespace folders, removed code that was commented out, removed unused code, added xml doc 2019-12-04 10:39:49 +01:00
Bjarke Berg
e7c85daa2e Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3970-membership-providers
# Conflicts:
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs
2019-12-03 08:58:49 +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
Warren Buckley
1471bffeff Adds DataValueReferenceFor & its collection 2019-12-02 15:00:56 +00:00
Bjarke Berg
f39324b732 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web 2019-12-02 14:13:33 +01:00
Bjarke Berg
1da4429177 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
#	src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
#	src/Umbraco.Abstractions/Exceptions/InvalidCompositionException.cs
#	src/Umbraco.Abstractions/IO/MediaFileSystem.cs
#	src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
#	src/Umbraco.Abstractions/Migrations/DataLossException.cs
#	src/Umbraco.Abstractions/Models/Entities/EntitySlim.cs
#	src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
#	src/Umbraco.Abstractions/Xml/XmlHelper.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
#	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
2019-12-02 13:51:07 +01:00
Bjarke Berg
b997b40f1d Handled Serilog enrichers..
- Introduced ISessionIdResolver and AspNetSessionIdResolver
2019-11-27 09:01:17 +01:00
Warren Buckley
7573d52807 Initial plumbing, extension methods etc for collection to store IDataValueReferences 2019-11-26 11:09:33 +00: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
969832310e Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web 2019-11-26 08:47:33 +01:00
Bjarke Berg
323a60fa76 Removed IOHelper.Default, to prepare for injecting 2019-11-26 08:15:00 +01:00
Shannon
73bb9e3279 Moves culture dictionary implementation to Core instead of web since it has nothing to do with Web really, fixes tests 2019-11-25 23:10:54 +11: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
Shannon Deminick
30417034de Merge pull request #7179 from umbraco/netcore/feature/AB3869-move-packages
Netcore: Movement of package abstractions
2019-11-22 11:51:58 +11:00
Bjarke Berg
3070ce55a8 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3734-move-io-stuff 2019-11-21 14:52:45 +01:00
Bjarke Berg
99fb19b7a3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3869-move-packages 2019-11-21 14:48:06 +01:00
Shannon
d35040e2eb couple more composer things 2019-11-22 00:32:33 +11:00
Shannon
79507c405d moving files 2019-11-22 00:25:26 +11:00
Bjarke Berg
3e360abf15 Removed static ApplicationUrlHelper and introduced IBackOfficeInfo and AspNetBackOfficeInfo 2019-11-21 14:19:56 +01:00
Bjarke Berg
54bd658d41 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web 2019-11-21 09:34:14 +01:00
Bjarke Berg
fc22282a59 Injecting IHostingEnvironment 2019-11-20 15:21:09 +01:00
Bjarke Berg
94791bcd11 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3734-move-io-stuff
# Conflicts:
#	src/Umbraco.Abstractions/IO/FileSystems.cs
#	src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
#	src/Umbraco.Abstractions/IO/ShadowWrapper.cs
#	src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
#	src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs
#	src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
#	src/Umbraco.Web/Trees/FilesTreeController.cs
2019-11-20 12:31:15 +01:00
Bjarke Berg
caa8ccd306 AB3869 - Removed UmbracoVersion from Core Current 2019-11-20 11:36:17 +01:00
Bjarke Berg
259c0263bd Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3869-move-packages
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
2019-11-20 11:32:57 +01:00
Carole Rennie Logan
015d588218 First comimt changing IUmbracoVersion 2019-11-19 22:37:14 +00:00