Matt Westcott
999950e9e3
Failing test for #1654
2015-09-01 10:44:32 +01:00
Matt Westcott
b62faf73ba
Clarify 'the directory containing wagtaildemo' - fixes #1651
2015-09-01 10:13:16 +01:00
Matt Westcott
4371368854
Merge pull request #1652 from kaedroho/image-chooser-12-images
...
Show 12 images in image chooser
2015-08-31 20:45:06 +01:00
Karl Hobley
13a6396c0b
Show 12 images in image chooser
2015-08-31 13:01:27 +01:00
Matt Westcott
a160922b9a
Merge branch 'kaedroho-issue-1584'
2015-08-28 23:08:06 +01:00
Matt Westcott
1ced5f0d6d
Release note for #1633
2015-08-28 23:07:49 +01:00
Matt Westcott
b541cadef3
Ignore any ResourceWarnings that happen while we're testing for the presence of a deprecation warning
2015-08-28 21:20:32 +01:00
Matt Westcott
3e51150f1d
Merge branch 'issue-1584' of https://github.com/kaedroho/wagtail into kaedroho-issue-1584
2015-08-28 20:31:18 +01:00
Matt Westcott
c072d94fe2
Don't show the page type of root (cherry-picked from #1482 )
2015-08-28 15:33:30 +01:00
Matt Westcott
91959c61ce
Add Joss Ingram to contributors
2015-08-28 14:57:12 +01:00
Matt Westcott
c26e3c1910
Merge branch 'kaedroho-issue-1276b'
2015-08-28 14:56:10 +01:00
Matt Westcott
e25464eee9
Release note for #1626
2015-08-28 14:55:54 +01:00
Matt Westcott
14c9d9d34d
Merge branch 'issue-1276b' of https://github.com/kaedroho/wagtail into kaedroho-issue-1276b
2015-08-28 14:41:36 +01:00
Matt Westcott
07793aeaee
Merge pull request #1625 from kaedroho/show-in-menus-filter-field
...
Added show_in_menus into Page filter fields
2015-08-28 12:09:38 +01:00
Matt Westcott
ffeb1004e7
Merge branch 'kaedroho-show-deprecation-warnings-for-next-version'
2015-08-28 11:44:32 +01:00
Matt Westcott
6c35fb8d63
Merge branch 'show-deprecation-warnings-for-next-version' of https://github.com/kaedroho/wagtail into kaedroho-show-deprecation-warnings-for-next-version
2015-08-28 11:43:49 +01:00
Matt Westcott
8c8606b5c7
Merge branch 'jossingram-snippet_chooser_panel'
2015-08-28 10:59:39 +01:00
Matt Westcott
1e4618935d
Release note for #1375
2015-08-28 10:59:19 +01:00
Matt Westcott
2ed16e3ee2
Update documentation to indicate that SnippetChooserPanel no longer requires a snippet_type argument
2015-08-28 10:57:31 +01:00
Matt Westcott
6a7a23364b
Get snippet type name from model, not content type (otherwise it returns 'Content type')
2015-08-28 10:39:27 +01:00
Matt Westcott
939ff0827b
Turn snippet_type_name into a class method
2015-08-28 10:13:25 +01:00
Matt Westcott
0ea5eee45e
Failing test for snippet chooser button text
2015-08-27 19:57:26 +01:00
Matt Westcott
64a58be072
Allow the snippet_type argument to be omitted from SnippetChooserPanel; add tests
2015-08-27 17:34:51 +01:00
Matt Westcott
cd51efea6a
Use a real field name and a valid snippet model in SnippetChooserPanel tests
2015-08-27 17:31:10 +01:00
Matt Westcott
028632eabe
PEP8 fixes
2015-08-27 17:24:06 +01:00
Matt Westcott
b1ca612965
Merge branch 'snippet_chooser_panel' of https://github.com/jossingram/wagtail into jossingram-snippet_chooser_panel
...
Conflicts:
wagtail/wagtailsnippets/tests.py
2015-08-27 17:22:22 +01:00
Matt Westcott
e15c3ddda8
Merge branch 'kaedroho-cleanup-query'
2015-08-27 16:33:07 +01:00
Matt Westcott
85ebfad95a
Merge branch 'cleanup-query' of https://github.com/kaedroho/wagtail into kaedroho-cleanup-query
2015-08-27 16:32:29 +01:00
Matt Westcott
4353759018
Merge branch 'kaedroho-snippets-search'
...
Conflicts:
CHANGELOG.txt
2015-08-27 15:42:45 +01:00
Matt Westcott
7751a8439a
Release note for #1610
2015-08-27 15:41:32 +01:00
Matt Westcott
c9aa44cc7e
Add documentation for searchable snippets
2015-08-27 15:29:01 +01:00
Matt Westcott
97febeb089
Merge branch 'snippets-search' of https://github.com/kaedroho/wagtail into kaedroho-snippets-search
2015-08-27 14:26:59 +01:00
Karl Hobley
ebf212d850
Merge pull request #1629 from alexgleason/snippets-doc-fix
...
Snippets docs: __str__ instead of __unicode__
2015-08-27 11:44:25 +01:00
Karl Hobley
c8fd797319
Fix Python 2 issue in "fill" image operation
2015-08-27 11:40:11 +01:00
Karl Hobley
c33ec77150
Changelog for fill operation fix
2015-08-27 11:24:29 +01:00
Karl Hobley
217e9628c7
Fix to the way crop rects are rounded
...
Eight and bottom were previously rounded down which sometimes led to images having a width/height of 0
This fixes a ZeroDivisionError and potential "tile cannot extend outside image" errors when resizing JPEGs
2015-08-27 11:19:03 +01:00
Karl Hobley
4901f5dbf8
Unpin djangorestframework in setup.py
2015-08-26 17:02:33 +01:00
Matt Westcott
bc9c7f3f01
Merge branch 'kaedroho-frontendcache-without-requests'
2015-08-26 16:38:48 +01:00
Matt Westcott
d67fe598bb
Remove 'requests' from tox dependencies
2015-08-26 16:38:38 +01:00
Karl Hobley
94565bac8a
Fixed snippet chooser pagination for non searchable snippets
...
Pagination links are generated from the search form action.
This change always puts the search form into the HTML, but removes the search box and submit button when the snippet is not searchable.
The user doesn't see the form and the pagination links work again.
2015-08-26 16:38:12 +01:00
Matt Westcott
c2421246a8
Release note for #1494
2015-08-26 16:38:08 +01:00
Matt Westcott
1081dcf907
Merge branch 'frontendcache-without-requests' of https://github.com/kaedroho/wagtail into kaedroho-frontendcache-without-requests
2015-08-26 16:17:17 +01:00
Karl Hobley
2242244c4b
Show total count of found snippets on snippet listing as well
2015-08-26 15:57:03 +01:00
Karl Hobley
feeff49e05
Merge pull request #1630 from kaedroho/multilingual-docs
...
Improvements to internationalisation docs
2015-08-26 15:39:17 +01:00
Karl Hobley
2e79724dbe
Pulled translations from transifex
2015-08-26 15:18:39 +01:00
Matt Westcott
3adaf06cd0
Merge branch 'snippets-search' of https://github.com/kaedroho/wagtail into kaedroho-snippets-search
2015-08-26 15:09:57 +01:00
Karl Hobley
521e8c01a6
Added transifex config for wagtailstyleguide
2015-08-26 15:07:39 +01:00
Karl Hobley
6c2bbad17e
Added source translations for wagtailsearchpromotions
2015-08-26 15:06:05 +01:00
Karl Hobley
8e0685085f
Added wagtailsearchpromotions to tx config
2015-08-26 15:06:05 +01:00
Karl Hobley
039b0a58b9
Rebuilt source translation files
2015-08-26 14:29:26 +01:00
