mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
5 180 Commity
56 Gałęzie
257 Tagi
3,4 GiB
Wykres commitów

5180 Commity (f63986f47d9465a488ea9457b9149fba7fe4e1e7)

Autor SHA1 Wiadomość Data
Matt Westcott f63986f47d If explorer nav menu is empty, take user directly to the explorer view 2015-10-15 22:37:22 +01:00
Matt Westcott c0f390a9c2 Merge branch 'timorieber-cleanup/project-template-documentation' 2015-10-15 09:22:00 +01:00
Matt Westcott bebc4d4ed3 Remove mention of SASS / django-compressor; fix minor text errors 2015-10-15 09:21:47 +01:00
Matt Westcott e1b564ee80 Merge branch 'cleanup/project-template-documentation' of https://github.com/timorieber/wagtail into timorieber-cleanup/project-template-documentation 2015-10-15 09:18:42 +01:00
Timo Rieber f522b146b3 Removed vagrant configuration section 2015-10-15 08:11:16 +02:00
Timo Rieber 8e2c5cfd87 Synced structure to reflect current project template 2015-10-15 08:10:27 +02:00
Matt Westcott 30d5b62eed Fix broken link to topics/pages 2015-10-14 17:28:49 +01:00
Matt Westcott 14b1fa68b8 Merge branch 'kaedroho-issue/1671' 2015-10-14 17:26:12 +01:00
Matt Westcott da42620089 Release note for #1791 2015-10-14 17:26:03 +01:00
Matt Westcott e946215817 Merge branch 'issue/1671' of https://github.com/kaedroho/wagtail into kaedroho-issue/1671 2015-10-14 17:23:49 +01:00
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