mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 01:46:24 +01:00
Code Issues Releases Wiki Activity
5,169 Commits 56 Branches 258 Tags 416 MiB
148f05e0d2
Commit Graph

5169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Westcott
148f05e0d2 Merge branch 'RyanPineo-fix-page-edit-publish-view-live-url' 2015-10-14 17:16:34 +01:00
Matt Westcott
7e7ba37639 Release note for #1770 2015-10-14 17:16:21 +01:00
Matt Westcott
bf0166945c reword comment - the URL *may* have changed 2015-10-14 17:11:59 +01:00
Matt Westcott
33faa40ecd Merge branch 'fix-page-edit-publish-view-live-url' of https://github.com/RyanPineo/wagtail into RyanPineo-fix-page-edit-publish-view-live-url 2015-10-14 17:09:59 +01:00
Matt Westcott
e45b73fd0b Merge branch 'kaedroho-html-comments-in-rich-text' 2015-10-14 17:07:44 +01:00
Matt Westcott
bb8894aa6c Release note for #1821 2015-10-14 17:07:26 +01:00
Matt Westcott
55e98db83a Merge branch 'html-comments-in-rich-text' of https://github.com/kaedroho/wagtail into kaedroho-html-comments-in-rich-text 2015-10-14 16:57:34 +01:00
Karl Hobley
e6fcb9e504 Merge pull request #1811 from gasman/fix/frontend-search-use-queryset 
Update frontend search to use queryset-based search method
 2015-10-14 16:21:33 +01:00
Matt Westcott
baf36e0111 Merge branch 'kaedroho-docs-self-var' 2015-10-14 15:26:04 +01:00
Matt Westcott
9b6a389850 Add note about variable names to Jinja2 release notes 2015-10-14 15:25:40 +01:00
Matt Westcott
c1edbe6a98 Merge branch 'docs-self-var' of https://github.com/kaedroho/wagtail into kaedroho-docs-self-var 2015-10-14 14:52:00 +01:00
Karl Hobley
ed1a0f9bb1 Merge pull request #1823 from gasman/fix/page-manager-from-queryset 
Eliminate duplicated PageQuerySet methods / make `sibling_of` behaviour consistent
 2015-10-14 14:35:14 +01:00
Matt Westcott
142647ca0b Update frontend search to use queryset-based search method - fixes #1808 2015-10-14 12:10:06 +01:00
Matt Westcott
055cdef5bd Merge pull request #1793 from takeflight/tests/expectedFailure-streamfield 
Fix expectedFailures for StreamFields
 2015-10-14 11:55:44 +01:00
Tim Heap
a9906cf0cb Correctly order sub-blocks in multiply inherited blocks 
Multiply inherited StructBlocks and StreamBlocks now correctly order
their sub-blocks, in reverse MRO order. `declared_blocks` was being
overridden with `base_blocks`, which was screwing with the order.
Additionally, the order of fields when inheriting from multiple parents
is not obvious at first, so a comment has been added to the test
explaining the expected behaviour.
 2015-10-14 11:29:42 +11:00
Tim Heap
b6fba1b590 Sanitise value for StructBlocks before rendering 
Only known fields are passed in to the template, instead of allowing any
arbitary data. Additionally, fields in value now appear in the same
order that they are declared in
 2015-10-14 11:29:42 +11:00
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
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
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