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 |
|
Shannon
|
6398f1e216
|
Creates ITypeFinder interface and simplifies type finder with TypeFinderExtensions, moves GetTypeByName to TypeHelper using assembly name parsing instead of scanning every assembly.
|
2019-11-08 14:26:06 +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 |
|
Kenn Jacobsen
|
438133ae1f
|
Make sure treepicker URLs are displayed for the current editor culture
|
2019-08-16 08:43:31 +02:00 |
|
Shannon
|
da525513a3
|
Merge remote-tracking branch 'origin/v7/dev' into v8/dev
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/UmbracoHelper.cs
|
2019-07-15 16:18:04 +10:00 |
|
Bjarne Fyrstenborg
|
82eb241119
|
Add overload method for Udi
|
2019-07-13 14:49:05 +02:00 |
|
Bjarke Berg
|
c5f1cc15fd
|
Refactored dataTypeId when a guid into dataTypeKey
|
2019-07-03 08:33:30 +02:00 |
|
Shannon
|
d3b4b9fe64
|
fix merge
|
2019-07-03 11:10:34 +10:00 |
|
Shannon
|
33aff7ff61
|
Merge branch 'v8/dev' into v8/bugfix/fixes-for-bypass-securtiy-after-merge
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
|
2019-07-03 11:04:34 +10:00 |
|
Sebastiaan Janssen
|
4d2c551b79
|
Merge branch 'v7/dev' into v8/dev
|
2019-07-02 22:01:34 +02:00 |
|
Bjarke Berg
|
e6484687e5
|
Small fixes after v7 to v8 merge regarding the bypass security feature
|
2019-07-02 11:17:23 +02:00 |
|
Bjarke Berg
|
3c0565e516
|
Bugfix: Null ref-exception when using member pickers.
|
2019-07-02 10:56:44 +02:00 |
|
Shannon
|
42d86f147f
|
gets content picker ignore start nodes working, fixes descriptions
|
2019-07-01 18:23:36 +10:00 |
|
Shannon
|
1885767ef1
|
Internalizes the new Anchor logic and removes it from the IContentService interface into extensions.
|
2019-07-01 16:33:09 +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 |
|
Shannon
|
a55323176f
|
Updates EntityController to support passing in the dataTypeId for the GetChildren methods and updates the mediapicker to pass along that data
|
2019-06-26 14:35:36 +10:00 |
|
Bjarke Berg
|
9f45d41a4a
|
https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479
- Test fixes
|
2019-06-25 13:18:15 +02:00 |
|
Bjarke Berg
|
1994194656
|
https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479
- Review fixes
|
2019-06-25 11:51:02 +02:00 |
|
Bjarke Berg
|
d4311fe4ab
|
https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Replaced client side method to get Auchors with a server side version, and eliminated the use of contentResource in linkPikers
|
2019-06-24 10:52:35 +02:00 |
|
Bjarke Berg
|
4df838c20c
|
https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1358 - Changed the ignoreUserStartNodes in public endpoints to the data type id, and then look up the setting
|
2019-06-20 16:02:42 +02:00 |
|
Bjarke Berg
|
1dd2c1cb91
|
Revert "Revert "U4 10147 - Bypass User Security option in pickers (#2441)""
This reverts commit 994c6eed
|
2019-06-19 14:30:44 +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 |
|
Sebastiaan Janssen
|
22f54394fb
|
Fix method signatures to prevent breaking changes (just like what I'd already done in v8)
|
2019-06-07 16:02:03 +02:00 |
|
Kenn Jacobsen
|
30067d92ae
|
V8: Always show content and media search results first (#5309)
|
2019-05-31 20:29:00 +02:00 |
|
leekelleher
|
e958ca6f89
|
Fixed EntityController.ConvertToObjectType (for MemberType)
When the `entityType` was "MemberType", it would return the "MediaType" object-type.
|
2019-05-09 07:21:18 +01: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 |
|
Stephan
|
6c8ded6275
|
Better mapping of enumerable
|
2019-04-08 16:41:33 +02:00 |
|
Stephan
|
d274737296
|
Refactor more mappers
|
2019-03-27 09:15:32 +01: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 |
|
Shannon
|
04487557d7
|
Merge branch 'v8-fix-use-client-culture' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-use-client-culture
|
2019-02-19 01:05:11 +11:00 |
|
Bjarke Berg
|
aef83b86d4
|
Merge branch 'temp8' into temp8-injection-ihttpcontextaccessor-instead-of-controller
# Conflicts:
# src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
# src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
|
2019-02-18 09:10:47 +01:00 |
|
Shannon
|
02e3a8f19c
|
Removes all inter-dependencies between UmbracoContext, UmbracoHelper and MembershipHelper and moves Html methods to HtmlHelper extensions. This simplifies UmbracoHelper and MembershipHelper to not require huge dependencies and splits the logic in a nicer fashion instead of wrapping everything
|
2019-02-15 11:43:56 +11:00 |
|
Bjarke Berg
|
1770a0abec
|
Inject IUmbracoContextAccessor instead of UmbracoContext
|
2019-02-14 12:40:45 +01:00 |
|
Kenn Jacobsen
|
3587a774f3
|
Merge with temp8
|
2019-02-09 18:03:53 +01:00 |
|
Kenn Jacobsen
|
cb33442e7c
|
Tidy up a bit
|
2019-02-09 17:50:29 +01:00 |
|
Kenn Jacobsen
|
89a701c865
|
Initial PoC
|
2019-02-09 15:41:30 +01:00 |
|
Shannon
|
33bc979cfc
|
Fixes binding of FormDataCollection for GET requests which fixes the compatibility with the latest WebApi 5.2.7 version (cherry picked from https://github.com/umbraco/Umbraco-CMS/pull/3851), fixes a binding redirect
|
2019-02-06 17:03:23 +11:00 |
|
Shannon
|
a0cda4075d
|
Fixes issue with rendering macro content when the page doesn't exist
|
2019-02-04 13:42:07 +11:00 |
|
Shannon
|
c5819ca702
|
Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
|
2019-02-04 12:42:07 +11:00 |
|
Shannon
|
c0ab9d9e59
|
Merge branch 'temp8' into temp8-member-search-and-tags
# Conflicts:
# src/Umbraco.Web/Editors/MemberController.cs
|
2019-02-01 16:43:03 +11:00 |
|
Shannon
|
7b55d2f1b2
|
New IMacroRenderer and ITemplateRenderer and hides underlying logic for these in internal classes. Massively cleans up the macro rendering logic (almost makes sense now), removes unused macro code, injects UmbracoHelper wherever it's needed (not creating manually), fixes UmbracoHelper to have it's services injected, no more empty services, allows setting the AssignedContentItem on the UmbracoHelper and ensures it's lifespan is Transient, updates all corresponding ctors. Fixes macro rendering, ensures the correct culture variation is assigned, and that we can render macros for any given IPublishedContent, not just the one assigned in the request.
|
2019-01-31 15:09:31 +11:00 |
|
Shannon
|
273441a2fb
|
Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
|
2019-01-30 20:09:07 +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
|
0b6ba5aa52
|
Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148)
|
2019-01-26 16:52:19 +01:00 |
|
Bjarke Berg
|
ec8c455635
|
Fixes for search of members + Removed fixme in member that apparently are not necessary after tags refactoring
|
2019-01-24 11:28:27 +01:00 |
|
Bjarke Berg
|
f10b35780c
|
- Removed PostFilterParams
- Handling of PostFilter using Expression trees
|
2019-01-23 10:22:29 +01:00 |
|