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 |
|
Warren Buckley
|
81a0a52874
|
Merge branch 'v8/feature/media-tracking' into v8/dev
# Conflicts:
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
|
2020-01-22 08:36:32 +00:00 |
|
Bjarke Berg
|
d7377bd9b4
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DataTypeController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
|
2020-01-21 10:51:04 +01: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 |
|
Benjamin Carleski
|
fceac19f04
|
Update controllers to include UmbracoMapper
|
2020-01-20 14:15:54 -08:00 |
|
Poornima Nayar
|
1cd30aae99
|
Merge pull request #6943 from kjac/v8/fix/protect-system-media-types
V8: Protect "system media types" from alias changes and deletion
|
2020-01-09 14:18:10 +00:00 |
|
Kenn Jacobsen
|
a1b8d4a097
|
Don't load duplicate nodes for editors with start nodes
|
2020-01-08 19:46:35 +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 |
|
Søren Kottal
|
d55897c635
|
Use the editor icon for data type trees (#7373)
|
2019-12-21 16:33:36 +01:00 |
|
Poornima Nayar
|
5148b3ca40
|
Merge pull request #6910 from kjac/v8/feature/member-type-search
V8: Make member types searchable
|
2019-12-20 09:43:44 +00:00 |
|
Kenn Jacobsen
|
22968b4af4
|
Reflect inherited permissions in child node menus (#6798)
|
2019-12-19 16:25:03 +00:00 |
|
Poornima Nayar
|
2dfabae9b9
|
Merge pull request #6672 from kjac/v8/fix/actions-multiple-groups
V8: Handle permissions for users in multiple groups
|
2019-12-19 09:18:40 +00: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
|
86574c5e11
|
Moved more files to abstractions
|
2019-12-06 12:09:47 +01:00 |
|
Shannon
|
97ad7a0239
|
removes more membership provider and System.Web.Security from being used in the back office
|
2019-12-03 16:16:33 +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 |
|
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
|
4f204543e6
|
AB3734 - Moved alot of stuff from Umbraco.Core.IO into abstractions
|
2019-11-19 07:53:40 +01:00 |
|
Søren Gregersen
|
7b19ab005b
|
first round of refactoring
|
2019-11-13 21:12:02 +01:00 |
|
Shannon
|
c58c31c6bd
|
Split Udi into UdiParser & UdiParserServiceConnectors, remove GuidUdi and StringUdi Parse methods (makes no sense), adds generic parse method to UdiParser, simplifies tests, removes Current usage
|
2019-11-13 16:33:40 +11:00 |
|
Bjarke Berg
|
63bfc4c2c0
|
Move constants
|
2019-11-05 14:55:42 +01:00 |
|
Bjarke Berg
|
befcabfced
|
Move constants
|
2019-11-05 13:28:26 +01:00 |
|
Shannon
|
602acce8f4
|
Gets entity repository to be able to return a mix of object types
|
2019-11-05 15:50:49 +11:00 |
|
Shannon
|
595b36c5df
|
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking
# Conflicts:
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
|
2019-11-01 13:27:13 +11:00 |
|
Kenn Jacobsen
|
546a948d0b
|
Protect "system media types" from alias changes and deletion
|
2019-10-29 12:13:42 +01:00 |
|
Kenn Jacobsen
|
f6aee731fc
|
Make member types searchable
|
2019-10-27 21:35:26 +01:00 |
|
Shannon
|
15865d566b
|
Implements the tracking for document/media/member repos
|
2019-10-25 14:17:18 +11:00 |
|
Kenn Jacobsen
|
b46d6718c4
|
Use the member type icon in the members section
|
2019-10-24 21:05:13 +02:00 |
|
Kenn Jacobsen
|
b0d7bdaa77
|
V8: Filter out invalid selections in the MNTP "Allowed items" picker (#6641)
|
2019-10-24 17:21:38 +02:00 |
|
Kenn Jacobsen
|
6c6b23c465
|
V8: Add irreversible warning when deleting items from the recycle bin (#6600)
|
2019-10-16 15:28:03 +02:00 |
|
Shannon Deminick
|
63ae00b0f3
|
Fixes Search an element from its GUID with the backoffice #6185 (#6530)
|
2019-10-14 15:07:44 +02:00 |
|
Kenn Jacobsen
|
f6e7740c93
|
Use all assigned groups and explicit permission assignments when calculating available actions for a given node
|
2019-10-11 15:07:32 +02:00 |
|
Bjarke Berg
|
c5f1cc15fd
|
Refactored dataTypeId when a guid into dataTypeKey
|
2019-07-03 08:33:30 +02:00 |
|
Shannon
|
ba7cd48b8f
|
Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715
# Conflicts:
# src/Umbraco.Core/Constants-DataTypes.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
|
2019-07-02 10:49:20 +10:00 |
|
Shannon
|
42d86f147f
|
gets content picker ignore start nodes working, fixes descriptions
|
2019-07-01 18:23:36 +10:00 |
|
Shannon
|
4a33ca99ba
|
More manual merging
|
2019-06-28 15:03:52 +10:00 |
|
Shannon
|
568835f7e2
|
manual merging/fixing, project builds now, but need to manually merge the remaining
|
2019-06-28 13:24:13 +10:00 |
|
Shannon
|
84aa861a5b
|
Merge remote-tracking branch 'origin/v7/dev' into v8/dev - Iniital commit (broken)
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-DataTypes.cs
# src/Umbraco.Core/Models/DataTypeDefinition.cs
# src/Umbraco.Core/Models/DataTypeExtensions.cs
# src/Umbraco.Core/Models/IDataTypeDefinition.cs
# src/Umbraco.Core/Models/UmbracoEntity.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
# src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Services/IDataTypeService.cs
# src/Umbraco.Core/Services/IEntityService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/Implement/RelationService.cs
# src/Umbraco.Tests/Models/UmbracoEntityTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
# src/Umbraco.Web.UI.Client/src/common/services/search.service.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebBootManager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
# src/umbraco.cms/businesslogic/web/Access.cs
|
2019-06-28 13:03:36 +10:00 |
|
leekelleher
|
580ba79619
|
Icon Constants consistency
Updated the `Constants.Icons` and replaced the hard-coded strings with
the const references.
|
2019-06-27 22:35:29 +02:00 |
|
Lee Kelleher
|
fbe184ef6e
|
Prevent deletion of System DataTypes (#5623)
|
2019-06-27 22:33:19 +02:00 |
|
Kenn Jacobsen
|
9d14c9e0b7
|
Don't explicitly allow deleting the current editor's own content
|
2019-06-27 13:28:54 +02:00 |
|
Sebastiaan Janssen
|
56545ad7f1
|
Revert "Merge branch 'v7/dev' into v8/dev"
This reverts commit 7db0440b5c.
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
|
2019-06-18 19:18:48 +02:00 |
|
Sebastiaan Janssen
|
994c6eed50
|
Revert "U4 10147 - Bypass User Security option in pickers (#2441)"
This reverts commit cc9a7ff942.
# Conflicts:
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
|
2019-06-18 13:07:40 +02:00 |
|
Shannon
|
9927ff3c86
|
removes commented out code
|
2019-06-13 23:47:48 +10:00 |
|
Shannon
|
16f6bbcbd4
|
init commit of removing code for entity service that loads in any property data
|
2019-06-13 18:45:33 +10:00 |
|
Kenn Jacobsen
|
30067d92ae
|
V8: Always show content and media search results first (#5309)
|
2019-05-31 20:29:00 +02:00 |
|
Sebastiaan Janssen
|
9ec95c7aa2
|
Merge pull request #5520 from kjac/v8-fix-macro-tree-sorting
V8: Sort macros alphabetically
|
2019-05-31 16:21:29 +02:00 |
|
Kenn Jacobsen
|
460653d078
|
Don't show "Reload" for container nodes
|
2019-05-26 19:06:24 +02:00 |
|
Kenn Jacobsen
|
a4f1b433eb
|
Sort macros alphabetically
|
2019-05-25 10:34:03 +02:00 |
|