mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity
5,146 Commits 56 Branches 258 Tags 413 MiB
5bac77a648
Commit Graph

5146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Karl Hobley
eb27195e8f Fixed typo in Jinja2 docs 2015-10-08 16:59:58 +01:00
Matt Westcott
88f385e0de Add Tim Heap to authors 2015-10-08 15:48:58 +01:00
Karl Hobley
15e06c3120 Merge pull request #1794 from takeflight/tests/expectedFailure-document 
Fix expectedFailures for Documents
 2015-10-08 09:40:24 +01:00
Karl Hobley
73cc896a4f Fix syntax error (oops) 2015-10-08 09:37:21 +01:00
Karl Hobley
6495bb6736 Merge pull request #1799 from anurag-ks/master 2015-10-08 09:35:48 +01:00
Karl Hobley
8a0f6eab30 Changelog/release note and contributor for #1799 2015-10-08 09:35:21 +01:00
Karl Hobley
ce16e2cf08 Removed unneeded check 2015-10-08 09:32:18 +01:00
Tim Heap
f7b6f805ec Document filenames in the URL should not be checked 
Wagtail should be forgiving with filenames at the end of the URL. These
filenames are to make the URL look nice, and to provide a fallback for
browsers that do not handle the 'Content-Disposition' header filename
component. They should not be validated.
 2015-10-08 10:04:46 +11:00
Tim Heap
1d4b79f6aa Check for the correct filename in document headers 2015-10-08 10:04:46 +11:00