Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

Elasticsearch DSL
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

766668b6

Commit 766668b6 authored 9 years ago by Mantas Varatiejus

Downloads
- Plain Diff

Merge branch '1.x'

# Conflicts:
#	CHANGELOG.md
#	src/SearchEndpoint/FilterEndpoint.php
#	tests/Aggregation/FilterAggregationTest.php

parents 2fc32e71 9dc483de

No related branches found

No related tags found

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 7 additions, 1 deletion

CHANGELOG.md
docs/HowTo/HowToSearch.md 10 additions, 4 deletions

docs/HowTo/HowToSearch.md
docs/Query/Filtered.md 2 additions, 0 deletions

docs/Query/Filtered.md
src/BuilderInterface.php 3 additions, 0 deletions

src/BuilderInterface.php
src/DslTypeAwareTrait.php 2 additions, 0 deletions

src/DslTypeAwareTrait.php
src/FilterOrQueryDetectionTrait.php 2 additions, 0 deletions

src/FilterOrQueryDetectionTrait.php
src/Query/TypeQuery.php 1 addition, 1 deletion

src/Query/TypeQuery.php
src/Search.php 2 additions, 0 deletions

src/Search.php
src/SearchEndpoint/FilterEndpoint.php 0 additions, 11 deletions

src/SearchEndpoint/FilterEndpoint.php
src/SearchEndpoint/QueryEndpoint.php 10 additions, 6 deletions

src/SearchEndpoint/QueryEndpoint.php
tests/Query/GeoBoundingBoxQueryTest.php 6 additions, 6 deletions

tests/Query/GeoBoundingBoxQueryTest.php
tests/Query/HasChildQueryTest.php 2 additions, 4 deletions

tests/Query/HasChildQueryTest.php
tests/Query/HasParentQueryTest.php 2 additions, 4 deletions

tests/Query/HasParentQueryTest.php
tests/SearchEndpoint/FilterEndpointTest.php 3 additions, 3 deletions

tests/SearchEndpoint/FilterEndpointTest.php
tests/SearchEndpoint/PostFilterEndpointTest.php 3 additions, 3 deletions

tests/SearchEndpoint/PostFilterEndpointTest.php

with 55 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment