Bjarke Berg
|
ca3f65891d
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
|
2020-08-25 14:00:59 +02:00 |
|
Bjarke Berg
|
39162f0f6a
|
Merge conflicts resolved
|
2020-08-06 12:59:21 +02:00 |
|
Bjarke Berg
|
bf1784f9d1
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/ContentExtensions.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
|
2020-04-17 11:43:04 +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 |
|
Andy Butland
|
cdb65762f1
|
Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services
|
2020-03-30 14:17:16 +02:00 |
|
Shannon
|
7617027c49
|
Moves most of the UserRepositoryTest
|
2020-03-30 21:53:30 +11:00 |
|
Andy Butland
|
5a29365063
|
Revert change to overridden save method on key value repository.
|
2020-03-28 15:20:17 +01:00 |
|
Andy Butland
|
8958cf90b9
|
Moved non-scoped retrieval of key value into an extension method in IUmbracoDatabase.
|
2020-03-28 15:13:50 +01:00 |
|
Andy Butland
|
3e40389819
|
PR review amends on key value model and repository classes.
|
2020-03-28 15:04:11 +01: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
|
9d6762fb6a
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Models/PropertyType.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
# src/Umbraco.Tests/Models/PropertyTypeTests.cs
|
2020-03-10 08:25:43 +01: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
|
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 |
|
Bjarke Berg
|
bf4023afa7
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
# src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
|
2020-02-25 11:57:11 +01:00 |
|
Bjarke Berg
|
e96d094c71
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-02-20 08:26:04 +01:00 |
|
Shannon Deminick
|
ba2c0da379
|
Merge pull request #7646 from AndyButland/netcore/fix-circular-dependency-data-type-repository
Removed circular dependency between data type service and repository
|
2020-02-20 18:11:01 +11:00 |
|
Bjarke Berg
|
e6c315ff69
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
# src/Umbraco.Web/Editors/UpdateCheckController.cs
# src/Umbraco.Web/Install/InstallHelper.cs
|
2020-02-20 08:06:37 +01:00 |
|
Shannon
|
13a56eb085
|
Renames and refactors the MediaUrlGeneratorCollection and ensure that this collection is used wherever IMediaUrlGenerator is needed instead of relying property editors possibly being the implementation.
|
2020-02-19 16:37:00 +11:00 |
|
Andy Butland
|
0bba475533
|
Amends to key value service/repository to better match existing repository patterns.
|
2020-02-17 22:12:42 +01:00 |
|
Andy Butland
|
40d7baca79
|
Migrated database concerns from KeyValueService to new repository.
|
2020-02-15 11:08:32 +01:00 |
|
Andy Butland
|
1f8d4b1db7
|
Moved implementation of check for existance of username on creating user from user service to repository.
|
2020-02-15 09:20:59 +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 |
|
Andy Butland
|
927b7c0f75
|
Removed circular dependency between data type service and repository, by moving the creation of labels for missing property editors to the service.
|
2020-02-11 23:17:39 +01:00 |
|
Bjarke Berg
|
1bfb64bdd8
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/Constants-AppSettings.cs
# src/Umbraco.Abstractions/ContentVariationExtensions.cs
# src/Umbraco.Abstractions/IMainDom.cs
# src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
# src/Umbraco.Abstractions/Runtime/IMainDom.cs
# src/Umbraco.Abstractions/Runtime/MainDom.cs
# src/Umbraco.Core/IMainDom.cs
# src/Umbraco.Core/MainDom.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Infrastructure/MainDom.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoComponentRenderer.cs
|
2020-01-23 13:16:49 +01:00 |
|
Bjarke Berg
|
0cdd6ba29d
|
AB4635 - Moved CacheRefreshers to abstractions
|
2020-01-21 13:40:23 +01:00 |
|
Bjarke Berg
|
e1b06498c6
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
|
2020-01-07 08:06:36 +01:00 |
|
Bjarke Berg
|
0c7cc8e002
|
Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure
Netcore/feature/ab4227 move files to infrastructure
|
2020-01-06 15:43:00 +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 |
|
Bjarke Berg
|
cfacc4912d
|
AB4227 - Made some classes internal
|
2019-12-19 12:24:30 +01:00 |
|
Bjarke Berg
|
a22824e33a
|
AB4227 - Moved Persistence Repository implementations
|
2019-12-18 13:42:27 +01:00 |
|