yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,488 Commits 4 Branches 7 Tags
30067d92aed01615feaa6e4da7ec3c286402c218
Commit Graph

176 Commits

Author SHA1 Message Date
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
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
Stephan
fd6a5f60d2 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-19 16:06:35 +01:00
Stephan
5593d49719 Minor fixes as per PR#3852 discussion 2018-12-19 16:00:29 +01:00
Stephan
115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Shannon
193bc74f26 removes configuration based indexes 2018-12-18 17:55:30 +11:00
Shannon
4976782247 Updates search published content search extensions to correspond with new examine api changes, updates examine api changes 2018-12-17 12:17:03 +11:00
Shannon
4a23a6d3d0 Merge branch 'temp8-backoffice-search-with-variants' into temp8-examine-extensibility-3535 2018-12-14 13:17:51 +11:00
Shannon
9cc729d90b Merge branch 'temp8' into temp8-backoffice-search-with-variants 
# Conflicts:
#	src/Umbraco.Examine/ExamineExtensions.cs
 2018-12-14 13:06:54 +11:00
Stephan
7cad591b86 Fixes 2018-12-13 11:12:48 +01:00
Shannon
5e6320730d Updates nuspec to latest examine 2018-12-13 18:18:04 +11:00
Shannon
c8b3f11498 latest examine, tweaks to UmbracoFieldDefinitionCollection, adds some test code for testing 2018-12-13 15:04:18 +11:00
Stephan
3e082f1a94 Restructure registration of essential services, validate 2018-12-12 14:28:57 +01:00
Stephan
fc620af9d0 Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-12 08:58:25 +01:00
Shannon
826a8baff5 Merge branch 'temp8' into temp8-backoffice-search-with-variants 2018-12-12 13:37:19 +11:00
Shannon
7cb83373ca Creates base class LuceneIndexCreator 2018-12-12 12:46:58 +11:00
Shannon
15c7d7ce77 Creates a sub-generic interface for creating indexes 2018-12-12 12:37:21 +11:00