Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-17 19:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5673 commits 30 branches 112 tags 89 MiB
Commit graph

5673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Heap
aaee8e1576 ChoiceBlock return display value in get_searchable_content 
This fixes a `unittest.expectedFailure`, by rearranging the tests to
test the correct things.

FieldBlocks should not return anything from `get_searchable_content`. It
is up to subclasses to override it and return something relevant.
`ChoiceBlock` overrides it to return the display value of the chosen
item.
 2015-10-14 11:29:42 +11:00
Tim Heap
8e755b7db3 Fix bug where built assets may not be packaged 
The asset compilation that occurs as part of `python setup.py sdist`
would find all the files to include first, then recompile all the
assets, before finally packaging them all up. This means that if a new
file was created as part of the asset compilation that was not there
when all the files were first searched for, that file would not be
included in the package.

Now, the asset compilation happens before the file system is searched
for assets to include, so all assets should always be included.
 2015-10-14 10:58:07 +11:00
Matt Westcott
657dd0e347 Merge branch 'davecranwell-unified-thumbnail-sizes' 2015-10-13 22:46:15 +01:00
Matt Westcott
5bac77a648 Release note for #1822 2015-10-13 22:46:02 +01:00
Matt Westcott
5694dd1994 Merge branch 'unified-thumbnail-sizes' of https://github.com/davecranwell/wagtail into davecranwell-unified-thumbnail-sizes 2015-10-13 22:34:07 +01:00
Matt Westcott
0bb4bac2bc Release note for #1815 2015-10-13 19:32:29 +01:00
Matt Westcott
dafbdaf20f Use Manager.from_queryset to construct PageManager, to avoid duplication of queryset methods. 
This exposes an inconsistency between the old `PageManager.(not_)sibling_of` method (which was
exclusive by default) and `PageQuerySet.(not_)sibling_of)` (which is inclusive). We therefore
standardise on the inclusive behaviour (in line with treebeard's own sibling methods), and note
this change of behaviour in the release notes.
 2015-10-13 19:15:12 +01:00
Dave Cranwell
575dc2fa81 Removing need for an image rendition required by wagtail out the box, by reusing and shrinking another. 2015-10-13 17:32:30 +01:00
Matt Westcott
928bc0d25f Merge branch 'kaedroho-search-ordering' 2015-10-13 15:27:32 +01:00
Matt Westcott
c2a183f19f Documentation tweaks as per https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736415 https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736421 2015-10-13 15:17:47 +01:00
Matt Westcott
0f0310858b Move the QuerySet search method into a mixin 2015-10-13 15:17:47 +01:00
Matt Westcott
4133d4d243 Fix PageManager to pass 'operator' and 'order_by_relevance' kwargs to the queryset. 
Also add tests for the 'operator' kwarg.
 2015-10-13 14:29:10 +01:00
Karl Hobley
bb7753c0ec Remove HTML comments from rich text 
When text is pasted into a rich text block from MS word, HTML comments are created that contain lots of data that we don't need.

This commit changes the whitelister to remove any comment nodes it comes across.
 2015-10-13 13:49:42 +01:00
Matt Westcott
432a88d0d3 Add order_by_relevance flag to QuerySet search methods 2015-10-13 13:15:56 +01:00
Karl Hobley
a0d8284ad7 Tests for custom ordering in Elasticsearch 2015-10-13 10:10:21 +01:00
Karl Hobley
c926ee32b3 Implemented search ordering in Elasticsearch 2015-10-13 10:10:20 +01:00
Karl Hobley
8cd55cf8f2 Added order_by_relevance flag 2015-10-13 10:10:20 +01:00
Karl Hobley
e263d84e13 Refactoring ElasticSearchQuery 
Splits ElasticSearchQuery.to_es into three methods:

 - get_inner_query - Returns an unfiltered match or multi_match query
 - get_filters - Returns the filters to apply to the query
 - get_query - Returns the "inner query" with the filters applied (what to_es used to return)
 2015-10-13 10:08:27 +01:00
Karl Hobley
b278a0c0f8 Docs for custom ordering 2015-10-13 10:06:58 +01:00
Karl Hobley
4a6f2b5b43 Reworded sentence about using "self" in templates 2015-10-13 09:55:23 +01:00
Karl Hobley
6eae465e64 Renamed "self" template variable to "page" in docs 2015-10-13 09:52:16 +01:00
Matt Westcott
5b029cbfc4 Release note for #1702 2015-10-13 00:19:51 +01:00
Matt Westcott
dd4fd57023 Merge pull request #1702 from kaedroho/search-index-fields 
Add first publish/updated dates to search index
 2015-10-13 00:17:28 +01:00
Matt Westcott
ab9a6600db Merge branch 'alexgleason-fixbug-1549' 2015-10-13 00:16:04 +01:00
Matt Westcott
cb7dc8fd38 Release note for #1696 2015-10-13 00:15:50 +01:00
Matt Westcott
1ef376e6b3 Merge branch 'fixbug-1549' of https://github.com/alexgleason/wagtail into alexgleason-fixbug-1549 2015-10-13 00:06:00 +01:00
Matt Westcott
6febd4519b Merge branch 'takeflight-refactor/blank-except' 2015-10-12 22:34:05 +01:00
Matt Westcott
1dafd8d7eb Merge branch 'refactor/blank-except' of https://github.com/takeflight/wagtail into takeflight-refactor/blank-except 
Conflicts:
	wagtail/wagtailimages/rich_text.py
 2015-10-12 22:30:12 +01:00
Matt Westcott
0a7e840255 Merge branch 'kaedroho-search-operators' 2015-10-12 22:13:55 +01:00
Matt Westcott
5b8fd66909 Release note for #1682 2015-10-12 22:13:34 +01:00
Matt Westcott
06e721bc74 document the 'operator' kwarg on QuerySet.search 2015-10-12 22:04:29 +01:00
Matt Westcott
46845112e2 Allow block subclasses to pass extra context variables to templates 
Block now defines a get_context method, which subclasses can override
in the same way as we can for pages.
 2015-10-12 13:25:56 +01:00
Karl Hobley
4dbf166e06 Merged duplicate documentation 2015-10-12 12:20:45 +01:00
Karl Hobley
83f8332288 Added docs for search operators 2015-10-12 12:15:57 +01:00
Karl Hobley
fb09d89ec6 Search docs improvements 2015-10-12 12:15:33 +01:00
Karl Hobley
bc0760d23d Allow operator to be specified when searching 2015-10-12 12:14:13 +01:00
Karl Hobley
3449139e76 Replace backend _search methods with search_x_class attributes 2015-10-12 12:11:11 +01:00
Karl Hobley
e3154fa06f Merge pull request #1813 from takeflight/fix/javascript-style-error 
Fix JavaScript style error causing CI failures
 2015-10-12 12:07:07 +01:00
Tim Heap
b85d6dab3f Fix JavaScript style error causing CI failures 
The Drone JS style checker was complaining about the bad quotes.
 2015-10-10 13:22:34 +11:00
Matt Westcott
98e9b24ca0 Remove useless empty page-editor.js from wagtailforms 2015-10-09 20:12:21 +01:00
Matt Westcott
8e00899233 Merge branch 'kaedroho-fill-operation-fixes' 2015-10-09 17:17:08 +01:00
Matt Westcott
5aa5ffc7c0 Merge branch 'fill-operation-fixes' of https://github.com/kaedroho/wagtail into kaedroho-fill-operation-fixes 
Conflicts:
	wagtail/wagtailimages/image_operations.py
 2015-10-09 17:05:45 +01:00
Matt Westcott
337277ad92 Merge branch 'kaedroho-inline-panel-min-max' 2015-10-09 16:41:48 +01:00
Matt Westcott
6612f0adf3 Release note for #1529 2015-10-09 16:41:32 +01:00
Matt Westcott
3b78e923a0 Disable add button on InlinePanel when max_num reached 
As suggested by @salvadormf in https://github.com/torchbox/wagtail/pull/1529#issuecomment-127644330
 2015-10-09 16:32:44 +01:00
Matt Westcott
bce8bf1a5c Bump django-modelcluster version to 1.0 2015-10-09 15:47:49 +01:00
Matt Westcott
c21800b7b0 Merge branch 'inline-panel-min-max' of https://github.com/kaedroho/wagtail into kaedroho-inline-panel-min-max 
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
 2015-10-09 15:42:54 +01:00
Matt Westcott
51ed38e6e1 Fix Advert test model to inherit from ClusterableModel. 
django-modelcluster 1.0 includes a system check to ensure that ParentalKey points to a ClusterableModel; Advert falls foul of this.
 2015-10-09 15:24:14 +01:00
Karl Hobley
ea436e51cc Changelog/release note/contributor for #1688 2015-10-09 09:57:33 +01:00
Karl Hobley
80fbdca1a2 Merge pull request #1688 from maxxst/master 
updated settings so that there is no decrepation warning
 2015-10-09 09:54:27 +01:00