Karl Hobley
1475d440e3
len(ESResults) now runs query and gets the length of the results. Added ESResults.count() which asks Elasticsearch for the count but doesn't run the query
2014-06-20 11:42:17 +01:00
Karl Hobley
16b385da97
Slicing ESResults now returns a new ESResults object
...
Previously, slicing an ESResults object made it run a query against ElasticSearch and return the results
This commit changes this by making slice return a new ESResults object with start and stop limits applied. To get results, you now have to iterate the ESResults object.
2014-06-20 11:35:19 +01:00
Karl Hobley
69c9863d4c
Made finding objects for search results the responsibility of do_search
2014-06-20 11:18:18 +01:00
Karl Hobley
3d3d0eb2bd
Removed ability to use prefetch_related in search queries
...
This will be replaced by search on queryset
2014-06-20 11:15:02 +01:00
Karl Hobley
f73d66908e
Added __repr__ method to ElasticSearchQuery
2014-06-20 11:02:12 +01:00
Karl Hobley
b2844a3225
Renamed a couple of methods on ElasticSearchResults
2014-06-20 11:01:19 +01:00
Karl Hobley
112ff57d20
Split ESResults into ESResults and ESQuery
2014-06-20 10:58:44 +01:00
Karl Hobley
05cb87e3eb
Tests now succeed on elasticsearch 0.90.x
2014-06-20 10:31:48 +01:00
Karl Hobley
598e6193da
Install elasticsearch instead of elasticutils on travis
...
Conflicts:
.travis.yml
2014-06-20 10:31:21 +01:00
Karl Hobley
c00c4d2437
New ElasticSearch module now supports bulk insert
2014-06-20 10:30:23 +01:00
Karl Hobley
4081206c77
Scrapped ElasticUtils, use Elasticsearch-py instead
...
Conflicts:
wagtail/wagtailsearch/backends/elasticsearch.py
wagtail/wagtailsearch/indexed.py
2014-06-20 10:29:57 +01:00
Matt Westcott
b26744e137
changelog entry for #294
2014-06-19 22:06:41 +01:00
Matt Westcott
cac92de53f
Merge branch 'sixpearls-feature/image_tag_attrs'
2014-06-19 22:03:38 +01:00
Matt Westcott
0c4b5ba556
Add unit test for image tag with extra attributes
2014-06-19 22:02:45 +01:00
Matt Westcott
5e055972cd
Refactor image tag parser so that it only has two cases to handle
2014-06-19 21:55:45 +01:00
Matt Westcott
64b933ceee
Merge branch 'feature/image_tag_attrs' of https://github.com/sixpearls/wagtail into sixpearls-feature/image_tag_attrs -
...
Update img_tag to output extra attributes through format_html_join rather than a template.
Conflicts:
wagtail/wagtailimages/models.py
2014-06-19 21:34:01 +01:00
Matt Westcott
b0c462a453
Merge branch 'jeffrey-hearn-imagetags-attrs-prop'
2014-06-19 17:37:06 +01:00
Matt Westcott
aad0e24a48
Changelog entry for #299
2014-06-19 17:36:57 +01:00
Matt Westcott
f6ae1834fa
Document the 'attrs' property of image renditions
2014-06-19 17:34:59 +01:00
Matt Westcott
4e8e1f97ca
use self.attrs in AbstractRendition.img_tag to avoid duplication
2014-06-19 17:28:34 +01:00
Matt Westcott
188b17526d
Merge branch 'imagetags-attrs-prop' of https://github.com/jeffrey-hearn/wagtail into jeffrey-hearn-imagetags-attrs-prop
2014-06-19 17:21:56 +01:00
Karl Hobley
4c5a1b1ae9
Recache coverage badge
2014-06-19 14:17:27 +01:00
Karl Hobley
dd89d2d29e
Merge pull request #331 from kaedroho/tests-changes2
...
Tests changes
2014-06-19 14:04:56 +01:00
Dave Cranwell
03ce91c992
Update CONTRIBUTORS.rst
2014-06-19 12:28:07 +01:00
Karl Hobley
58ed918129
Merge pull request #330 from kaedroho/wagtailcore-cleanup
...
Wagtailcore cleanup
2014-06-19 10:14:19 +01:00
Karl Hobley
d95763251d
Corrected names of userbar tests
2014-06-18 17:29:24 +01:00
Dave Cranwell
06dc598d0a
Update CHANGELOG.txt
2014-06-18 17:25:58 +01:00
Karl Hobley
778c699151
Merge branch 'master' into tests-changes2
2014-06-18 17:25:47 +01:00
Karl Hobley
9a1da28c38
Changelog entries for #236 , #286 and #315
2014-06-18 17:22:46 +01:00
Tom Dyson
e40dea8d28
wagtail -> Wagtail in contributing.rst
2014-06-18 17:17:14 +01:00
Karl Hobley
f53ebfd7a9
Merge pull request #236 from davecranwell/feature/styleguide
...
Addition of a styleguide, for logged in users only and not publicly linked.
2014-06-18 17:04:44 +01:00
Dave Cranwell
f6eefb02b1
merge conflict resolved
2014-06-18 16:56:05 +01:00
Dave Cranwell
d34c504ba3
Merge pull request #286 from kaedroho/new-datetime-picker
...
New datetime picker
2014-06-18 16:53:24 +01:00
Dave Cranwell
c14ce44503
Merge pull request #315 from davecranwell/feature/minor-preview-improvement
...
Aesthetic improvements to preview experience.
2014-06-18 16:53:11 +01:00
Karl Hobley
ed4af844de
Added tests for userbar
2014-06-18 15:58:54 +01:00
Karl Hobley
3577e61880
Raise exception if userbar views are accessed by anonymous user
2014-06-18 15:58:22 +01:00
Karl Hobley
e76785d96d
Merge branch 'master' into tests-changes2
2014-06-18 15:49:26 +01:00
Karl Hobley
9c0f4212e3
Only allow logged in users to access the userbar views
2014-06-18 15:49:02 +01:00
Karl Hobley
cbc401befe
Deleted test to test query popularity over time (not implemented)
2014-06-18 14:50:42 +01:00
Karl Hobley
e220c77cc0
Added test to test reordering of editors picks
2014-06-18 14:20:42 +01:00
Karl Hobley
a05df1a534
Added posting tests to editors picks
2014-06-18 13:39:12 +01:00
Karl Hobley
620e58632f
General improvements to editorspicks tests
2014-06-18 13:08:54 +01:00
Karl Hobley
ec46d09772
Improved editors picks pagination tests
2014-06-18 13:05:33 +01:00
Karl Hobley
929aa0f5e8
Added posting tests to wagtaildocs
2014-06-18 12:26:15 +01:00
Karl Hobley
bf84b7f64a
Removed get method from wagtaildocs tests
2014-06-18 11:57:37 +01:00
Karl Hobley
1ca6de4d46
Improvements to wagtaildocs pagination tests
2014-06-18 11:54:12 +01:00
Karl Hobley
46fc45877c
Replaced get_query_set methods with get_queryset
2014-06-18 11:27:34 +01:00
Dave Cranwell
ace28dd602
move preview css to scss file
2014-06-18 11:26:11 +01:00
Karl Hobley
c46ab6c209
Renamed wagtailcore.util to wagtailcore.utils
2014-06-18 11:24:38 +01:00
Dave Cranwell
01df448796
Merge branch 'master' into feature/minor-preview-improvement
2014-06-18 11:06:12 +01:00
