Sebastiaan Janssen
b42883280b
Merge branch 'v8/dev' into v8/contrib
2020-02-25 22:36:33 +01:00
Paul Seal
69a1729967
Change the icon in the Document Types Tree to be the chosen icon instead of a default one. ( #7358 )
...
* - changed the icon in the document types tree to be the icon chose rather than the default doc type icon
* - rendered icons for media types and member types
* - used null coalescing for icon setting for better null handling
Co-authored-by: paulmoriyama <48755798+paulmoriyama@users.noreply.github.com >
2020-02-13 08:07:46 +00:00
Shannon
8dc9d4ace4
Updates c# ShouldRenderChildrenOfContainer to allow for nested list views
2020-02-12 11:44:57 +11: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
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
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
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
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
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
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
Sebastiaan Janssen
7db0440b5c
Merge branch 'v7/dev' into v8/dev
...
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/UriExtensions.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/search.service.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/mediaPicker/mediapicker.controller.js
# 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/components/content/umb-content-node-info.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/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.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/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
2019-04-17 14:35:59 +02:00
Shannon Deminick
ff707e8768
Merge pull request #4960 from kjac/v8-fix-tree-dialog-remove-recycle-bin
...
V8: Don't show the recycle bin in tree pickers/dialogs
2019-04-10 09:50:42 +10:00
Stephan
6c8ded6275
Better mapping of enumerable
2019-04-08 16:41:33 +02:00
Stephan
c5f934930e
Merge branch 'v8/dev' into v8/feature/284-auto-mapper
2019-04-02 12:03:05 +02:00
leekelleher
f4bd0cd1f5
Swapped all System.Root string conversions
...
to use the `System.RootString` constant.
This saves on integer parsing and reduces the number of
new strings being created.
Since the `System.Root` is `-1`, it didn't need the culture invariant
conversion.
2019-03-29 12:06:23 +00:00
Stephan
ef5646fa3b
Cleanup, reduce AutoMapper exposure
2019-03-27 09:15:31 +01:00
Dan White
cc9a7ff942
U4 10147 - Bypass User Security option in pickers ( #2441 )
2019-03-23 12:51:36 +01:00
Kenn Jacobsen
0c602567ce
Don't show the recycle bin in tree pickers/dialogs
2019-03-12 10:25:51 +01:00
Shannon Deminick
5ddba3e64e
Merge pull request #3851 from umbraco/temp-fix-formdatacollection-3796
...
Fixes binding of FormDataCollection for GET requests which fixes the …
2019-03-05 13:39:37 +10:00
Stephan
7185089f1d
Move sections to their own namespace
2019-02-18 11:22:25 +01:00
Bjarke Berg
a29f7b764f
Merge remote-tracking branch 'origin/temp8' into temp8-injection-ihttpcontextaccessor-instead-of-controller
...
# Conflicts:
# src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
# src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
2019-02-15 09:48:55 +01:00
Stephan
382a3aba81
Merge branch 'temp8' into temp8-reorg-composing
2019-02-14 13:38:41 +01:00
