Commit Graph

29 Commits

Author SHA1 Message Date
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
becce7800b Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 14:12:06 +01:00
Bjarke Berg
2ea8e7cdd0 Moved PropertyEditors from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 10:44:22 +01: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
87b2dc777c Changed System.Web.HttpUtility To System.Net.WebUtility 2019-11-26 13:28:46 +01:00
Bjarke Berg
2c9a1d9735 AB3869 move packages to abstractions 2019-11-19 13:01:00 +01:00
Bjarke Berg
683c0da468 Moved stuff from SystemDirectories into constants and IOHelper to avoid a circular dependency 2019-11-13 11:56:32 +01:00
Bjarke Berg
0fcf8325e3 Changed SystemDirectories from static to instance, Added interface in abstractions and create a static property on current. 2019-11-12 15:25:21 +01:00
Andy Butland
0fe373259b Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-09-30 18:45:00 +02:00
Shannon
e6805b23e3 Oops! didn't complete the scope, ok now package install works within a trans, fixes nucache changes to not pass around _liveGen since sometimes we want the latest that is not _liveGen 2019-09-18 00:10:02 +10:00
Shannon
ab79cd74b8 Fixes lazy iteration issue on package install 2019-09-17 23:31:32 +10:00
Shannon
47d3af9bb3 removes the test suspendable model factory code 2019-09-16 16:59:57 +10:00
Shannon
bc40216eca Ensure package installation for data is executed within a single scope/trans 2019-09-16 16:31:16 +10:00
Shannon
ebada94a48 temp - removing the SuspendSafeLiveFactory for now 2019-09-16 14:59:12 +10:00
Shannon
ba74b7543c wraps package uninstall in a scope, creates temp SuspendSafeLiveFactory method for testing 2019-09-16 11:47:05 +10:00
Andy Butland
5452ebaf6d Import and export of document type and property variations setting in packages 2019-08-15 21:57:09 +02:00
Andy Butland
a90f0c4070 Added custom validation messages to property types: model, dto and migration, update via property type editing, display when content editing. 2019-06-26 14:37:02 +02:00
Bjarke Berg
8e29dbd494 #4569 - Rename TinyMCE property editor alias (From TinyMCEv3)
#379 - Rename Label property editor alias (From NoEdit)
2019-02-15 13:52:02 +01:00
Robert
b5bd138bf7 Taking composite PropertyType's into consideration when creating content from xml (PackageInstallation) 2019-02-11 22:13:04 +01:00
Shannon
0d963d3c4d Fixing package installation for content templates 2019-02-12 01:58:42 +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
Chris Houston
78319bae9e Temp8 fix typos 2 (#4130) 2019-01-23 00:03:39 +01:00
Callum Whyte
cee1171d39 Removing masterpages support from V8 (#3971) 2019-01-18 10:53:38 +01:00
Shannon
94da9a6681 Gets package upgrading working along with package uninstallation with multiple versions 2019-01-16 17:25:46 +11:00
Shannon
d97b100bab fixes merge 2019-01-16 02:18:02 +11:00
Shannon
709df804e5 Updates tests and better type support for importing content 2019-01-16 00:13:40 +11:00
Shannon
44ab0991ce Package installing is working 2019-01-15 22:08:08 +11:00
Shannon
65e98928d4 Package data installation is now all migrated 2019-01-14 17:46:12 +11:00