Bjarke Berg
|
3406bdb40b
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# NuGet.Config
# src/Umbraco.Core/Models/RelationType.cs
# src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
|
2020-04-16 19:00:51 +02:00 |
|
Bjarke Berg
|
d2f361e816
|
Merge remote-tracking branch 'origin/v8/8.6' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
|
2020-04-16 18:54:45 +02:00 |
|
Shannon
|
52ecd59c11
|
fixes test
|
2020-04-17 00:01:26 +10:00 |
|
Bjarke Berg
|
b1d214a13d
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation
# Conflicts:
# src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
# src/Umbraco.Web.UI.NetCore/Startup.cs
# src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
|
2020-04-01 15:52:23 +02:00 |
|
Bjarke Berg
|
e3ac778fc9
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Cache/WebCachingAppCache.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
# src/Umbraco.Web/Macros/MacroRenderer.cs
# src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
|
2020-04-01 12:44:53 +02:00 |
|
Bjarke Berg
|
55426515c0
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation
# Conflicts:
# src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
# src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
# src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
# src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
# src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
# src/Umbraco.Web.UI.NetCore/Startup.cs
# src/Umbraco.Web.UI.NetCore/appsettings.json
|
2020-03-31 15:36:25 +02:00 |
|
Andy Butland
|
bc05370995
|
Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services
|
2020-03-28 14:31:23 +01:00 |
|
Bjarke Berg
|
8a0f031d6d
|
AB#5822 - Moved config
|
2020-03-25 13:29:40 +01:00 |
|
Arkadiusz Biel
|
3640ed259d
|
GetAllIds for Roles (#7806)
|
2020-03-24 15:15:52 +01:00 |
|
Erik-Jan Westendorp
|
0a79e28205
|
#7803 Add EditorGroupAlias and WriterGroupAlias to Constants cl… (#7804)
|
2020-03-24 14:03:51 +01:00 |
|
Bjarke Berg
|
73a1058dd1
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Models/Property.cs
|
2020-03-23 12:48:56 +01:00 |
|
Bjarke Berg
|
f84798322c
|
AB3671 - Moved WebRuntime into infrastracutre, and removed typefinder reference in AppCaches (Replaced with string input with Type)..
- Move initialized of Current.Factory out of webruntime
|
2020-03-19 08:53:18 +01:00 |
|
Shannon Deminick
|
0a45f4afef
|
Fixes issue with deep cloning property values (#7795)
|
2020-03-13 10:52:38 +01:00 |
|
Shannon
|
94c9057119
|
Moves some stub test objects to the common test lib
|
2020-03-13 12:44:42 +11:00 |
|
Shannon
|
4e4df96140
|
Creates new Umbraco.Tests.Common netstandard project to host the common testing functionality between netframework and netcore, this will be ongoing work (doesn't need to be done all at once)
|
2020-03-13 12:08:25 +11:00 |
|
Shannon
|
d92fc8736a
|
More cleanup, cleans up tests, cleans up the BuildManagerAssemblyProvider (even though it's not used)
|
2020-03-09 13:31:56 +11:00 |
|
Shannon
|
0c8426f308
|
Cleans up POC code (still more to do)
|
2020-03-09 13:14:16 +11:00 |
|
Shannon
|
41c2d01078
|
initial POC code
|
2020-03-09 11:03:42 +11: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
|
53953338d8
|
Merged Umbraco.Abstractions into Umbraco.Core
|
2020-03-03 13:42:07 +01:00 |
|
cyberdot
|
01362d0dd0
|
NetCore: Abstract ConfigurationManager references
|
2020-03-03 11:18:54 +00:00 |
|
elitsa
|
0a130d6bbd
|
Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests
|
2020-02-25 13:38:36 +01:00 |
|
Bjarke Berg
|
750b6f6a18
|
Move more files and fixed circular dependency
|
2020-02-19 09:29:10 +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
|
b57a7690f5
|
Moved More files to infrastructure/abstractions
|
2020-02-13 11:21:20 +01:00 |
|
Andy Butland
|
171fce2ecb
|
Moved PublishedCache from Umbraco.Web into .Net standard project.
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
|
2020-01-30 20:08:03 +01:00 |
|
elitsa
|
550568dda6
|
Creating an interface for FilePermissionHelper, making the implementation (in Umbraco.Web) singleton and adding the interface to Umbraco.Abstractions. Changing static methods in FilePermissionHelper to instance ones and fixing old way of referencing those methods. Removing the usage of Current in FolderAndFilePermissionsCheck. Fixing tests - mocking the newly created IFilePermissionHelper
|
2020-01-28 13:48:44 +01:00 |
|
Shannon
|
a020c52ff6
|
Simplifies IdKeyMap interface, moves the weird add mapping logic in PublishedSnapshotService to a composer.
|
2020-01-23 18:10:21 +11:00 |
|
Benjamin Carleski
|
0c1d54ba4d
|
Remove unused obsoletes from Umbraco.Web.UI.Client
|
2020-01-20 11:07:13 -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 |
|
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 |
|
Bjarke Berg
|
44a36227f9
|
Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure
Netcore/feature/ab4227 move files to infrastructure
|
2020-01-06 14:59:17 +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
|
0e4ac7f7d1
|
Merge remote-tracking branch 'origin/netcore/feature/AB4227-move-files-to-infrastructure' into netcore/feature/AB3677-remove-current-from-core
# Conflicts:
# src/Umbraco.Tests/TestHelpers/TestHelper.cs
|
2019-12-19 12:27:51 +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 |
|
Shannon
|
aae5fc0048
|
Removes BulkInsertRecordsWithTransaction and changes tests
|
2019-12-19 17:45:28 +11: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
|
1d61bc829c
|
Merge branch 'v8/dev' into v8/fix/6324-wrong-media-path-stored
|
2019-12-18 12:10:00 +11: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
|
67536a49a7
|
Moved Models from Umbraco.Core to Umbraco.Infrastructure
|
2019-12-10 08:37:19 +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
|
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 |
|
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 |
|
Warren Buckley
|
69faaa8797
|
Update tests to pass in an empty collection for the repository layers expecting the new dataValueReferencesCollection
|
2019-11-27 20:29:38 +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 |
|