Karl Hobley
7d0e03a08c
Merge pull request #365 from mope/80-fix-editors-picks-search
...
Fix #80
2014-06-24 16:41:24 +01:00
Tom Talbot
1f645a7ba0
Fix #80
...
Searching for a non-existent editor's pick now displays the correct not
found message.
2014-06-24 15:38:13 +01:00
Karl Hobley
b41a6d730f
Revert "Merge pull request #335 from mope/edit-handlers-unit-tests"
...
This reverts commit 7ad6be82f3
, reversing
changes made to 4c77a4b18a
.
2014-06-24 12:53:34 +01:00
Karl Hobley
7ad6be82f3
Merge pull request #335 from mope/edit-handlers-unit-tests
...
Add unit tests for edit_handlers.py. Lint edit_handlers.py.
2014-06-24 10:43:54 +01:00
Matt Westcott
4c77a4b18a
Merge pull request #343 from kaedroho/searchchanges/elasticsearchresults-refactor
...
Search Changes 2 - Refactor ElasticSearchResults class
2014-06-24 09:55:29 +01:00
Karl Hobley
3c1883bca0
Put prefetch related back in database backend
2014-06-24 09:42:31 +01:00
Karl Hobley
d25b6fb6c0
Put prefetch_related back
2014-06-24 09:14:42 +01:00
Karl Hobley
765657329e
Changelog entry for #342
2014-06-23 14:28:36 +01:00
Karl Hobley
2801c913dc
Docs update for #342 merge
2014-06-23 14:22:50 +01:00
Matt Westcott
766f14e709
Merge pull request #342 from kaedroho/searchchanges/ditch-elasticutils
...
Search Changes 1 - Ditch ElasticUtils
2014-06-23 14:11:24 +01:00
Karl Hobley
acd27306a8
Merge pull request #328 from gasman/feature/subpage_types_niceties
...
Additional UX/workflow niceties when subpage_types is in use
2014-06-23 09:42:47 +01:00
Matt Westcott
b8c0594fdf
Merge branch 'kcl-ddh-master'
2014-06-20 16:14:25 +01:00
Matt Westcott
f4c51d8205
add changelog entry for construct_whitelister_element_rules hook
2014-06-20 16:10:03 +01:00
Matt Westcott
1aab35ba24
add documentation for the construct_whitelister_element_rules hook
2014-06-20 16:08:50 +01:00
Matt Westcott
505a1291a8
Move construct_whitelister_element_rules hook logic into DbWhitelister, as the whitelist module should be Wagtail-agnostic
2014-06-20 15:22:54 +01:00
Matt Westcott
9bc770d0a6
Add unit tests for DbWhitelister, including ability to override the whitelist via hooks
2014-06-20 15:21:31 +01:00
jmiguelv
2afb13667f
Added a new hook to add new element rules to the Whitelister.
2014-06-20 15:21:31 +01:00
Matt Westcott
0ea934566f
Merge branch 'master' of github.com:torchbox/wagtail
2014-06-20 14:08:57 +01:00
Matt Westcott
55cd5aad83
Revert frame-writing stuff from #315 , as it fails when the preview loads before the placeholder - see https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595
2014-06-20 14:08:49 +01:00
Dave Cranwell
ba0805e521
Update frontenddevelopers.rst
...
typo fix
2014-06-20 14:07:33 +01:00
Dave Cranwell
135d4f20a6
Update frontenddevelopers.rst
2014-06-20 14:04:11 +01:00
Dave Cranwell
c1f2f745af
Update frontenddevelopers.rst
...
heading level fix
2014-06-20 13:49:25 +01:00
Dave Cranwell
8cb94f0b5c
Update frontenddevelopers.rst
...
Added notes about new image manipulation techniques
2014-06-20 13:46:43 +01:00
Tom Talbot
d68d764d91
Reorganise unit tests to obviate the use of del
2014-06-20 12:37:20 +01:00
Karl Hobley
a5834513c3
Implemented results caching on ElasticSearchResults
2014-06-20 11:51:38 +01:00
Karl Hobley
d4aa5d5090
Added __repr__ method to ElasticSearchResults
2014-06-20 11:43:33 +01:00
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
Tom Talbot
2156c0ddd2
Fix Travis test failures
2014-06-20 10:55:49 +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
Tom Talbot
342699839b
Merge branch 'master' into edit-handlers-unit-tests
2014-06-20 10:16:25 +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
Tom Talbot
e87190f5bb
Update edit handlers unit tests
...
Add more tests. Clean up modified class properties after tests finish.
Replace assertRegexpMatches with assertIn.
2014-06-19 17:23:36 +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