Kenn Jacobsen
|
18c0298720
|
Ensure correct icon for file types in search results
(cherry picked from commit 531dee1e75)
|
2019-08-29 13:34:55 +02:00 |
|
Linus Elander
|
0517f29134
|
Adjusts conditions for which indexes should be affected when a node is unpublished
(cherry picked from commit 7557c584d8)
|
2019-08-07 16:38:13 +02:00 |
|
Bjarke Berg
|
e4f346620e
|
Added runtime level to ExamineFinalComposer
|
2019-08-05 10:38:35 +02:00 |
|
Shannon
|
be4536cf16
|
Refactors ugly statics and nested classes
|
2019-08-05 17:14:29 +10:00 |
|
Shannon
|
89429bd65a
|
fixes ctor
|
2019-08-05 16:28:23 +10:00 |
|
Shannon
|
366058581a
|
Adds LuceneIndexDiagnostics to make it easier for devs and custom indexes
|
2019-08-02 01:15:08 +10:00 |
|
Shannon
|
9f6a7dec2e
|
Fixes how examine starts up to make it easier for custom index developers
|
2019-08-02 00:28:48 +10: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
|
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 |
|
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 |
|
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
|
7a6884d208
|
Rename mapper stuff
|
2019-04-03 10:39:49 +02: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
|
45f7e71787
|
Merge remote-tracking branch 'origin/temp8' into temp8-umbhelper-vs-umbcontext-cleanup
|
2019-02-15 13:09:26 +11: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 |
|
Stephan
|
382a3aba81
|
Merge branch 'temp8' into temp8-reorg-composing
|
2019-02-14 13:38:41 +01:00 |
|
Stephan
|
7660e9fb25
|
Reorganize composition code
|
2019-02-14 09:15:47 +01:00 |
|
Shannon
|
fd5a2f355b
|
Also exposes the SearchableTreeCollectionBuilder since that's required to be able to replace the ISearchableTree implementations
|
2019-02-14 11:08:39 +11:00 |
|
Shannon
|
c2ff32aaab
|
Fixing tests, don't expose UmbracoContext on UmbracoHelper, fixing all of the editor constructors
|
2019-02-01 15:24:07 +11:00 |
|
Stephan
|
27ecd795b2
|
Merge branch temp8 into temp8-fixtree
|
2019-01-28 10:19:36 +01: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 |
|
Stephan
|
e36ca2e957
|
Merge branch temp8 into temp8-fixtree
|
2019-01-22 14:08:14 +01:00 |
|
Stephan
|
ad026e25d7
|
Cleanup trees
|
2019-01-22 13:55:31 +01:00 |
|
Stephan
|
c840895f90
|
Deal with more fixme
|
2019-01-22 09:49:35 +01:00 |
|
Shannon
|
cfe1b17eec
|
Gets trees and sections loading now in a much more simplified way without any xml, now to cleanup
|
2019-01-17 16:40:11 +11:00 |
|
Shannon
|
355ac09d90
|
WIP - moved out the tree and section service from Core, these are web only things, removes their xml parsing, fixes base controller ctor params with UmbracoContext, need to implement tree/section collections taking into account controllers and not scanning so much
|
2019-01-17 13:20:19 +11:00 |
|
Stephan
|
8347fd79a3
|
Reviewing packages PR, various fixes
|
2019-01-16 13:20:49 +01:00 |
|
Shannon
|
db2a003444
|
change how the install status works, fixes infinite loop
|
2019-01-16 00:54:25 +11:00 |
|
Shannon
|
f6fdc9ae2d
|
Updates test, fixes some other issues during testing
|
2019-01-15 23:46:58 +11:00 |
|
Stephan
|
95ef6cd249
|
Merge branch 'temp8' into temp8-examine-updates-3920
|
2019-01-10 15:44:16 +01:00 |
|
Stephan
|
7db3644fcd
|
Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901
|
2019-01-10 14:04:52 +01:00 |
|
Shannon
|
f7c70bde1e
|
Fixing up the PublishedContentQuery.Search implementation 3920
|
2019-01-07 23:49:29 +11:00 |
|
Stephan
|
84f6239c98
|
Components Initialize and Terminate
|
2019-01-07 09:46:11 +01:00 |
|
Shannon
|
4ca95a11ee
|
Fixes index populator registration and fixes the populators/rebuilders to not execute any lookups if there are no indexes
|
2019-01-07 18:49:55 +11:00 |
|
Shannon
|
118ad5361a
|
Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901
# Conflicts:
# src/Umbraco.Examine/UmbracoExamineIndex.cs
|
2019-01-07 16:17:58 +11:00 |
|
Stephan
|
5670c6354e
|
Introduce ComponentComposer to simplify registration of components
|
2019-01-05 15:49:10 +01:00 |
|
Stephan
|
1bd4cba9ac
|
Fix component constructors
|
2019-01-04 08:36:38 +01:00 |
|
Stephan
|
816ed84a2f
|
Refactor components
|
2019-01-03 21:00:28 +01:00 |
|
Stephan
|
986a7f368f
|
Merge branch 'temp8' into temp8-removes-config-based-indexes-3901
|
2019-01-02 15:37:20 +01:00 |
|
Stephan
|
a60fd1b7be
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-21 15:47:08 +01:00 |
|
Stephan
|
90ab90d6b9
|
Fix ExamineComponent crashing on shutdown
|
2018-12-21 13:42:04 +01:00 |
|
Stephan
|
bb9846a6ca
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-21 10:58:38 +01:00 |
|
Stephan
|
d0623bc494
|
Merge branch 'temp8' into temp8-removes-config-based-indexes-3901
|
2018-12-21 09:25:37 +01:00 |
|