Wykres commitów

5040 Commity (ed8399caee1fed82a003db5aee5182bc3c01f4a4)

Autor SHA1 Wiadomość Data
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
Karl Hobley 4203714d91 Fix typo in fetch-translations.sh 2015-08-26 14:29:26 +01:00
Karl Hobley 140441feb6 Added script for rebuilding translation sources 2015-08-26 14:29:26 +01:00
Karl Hobley d5400c9690 Merge pull request #1637 from kaedroho/bs-explicit-html5lib
Explicity set html5lib as BeautifulSoup parser (fixes warnings)
2015-08-26 14:09:36 +01:00
Karl Hobley 9a255d2d1a Merge pull request #1634 from kaedroho/cleanup-json-responses
Use Djangos JsonResponse class when returning JSON from views
2015-08-26 14:09:18 +01:00
Karl Hobley 695099f958 Changelog for #1528 2015-08-26 14:08:20 +01:00
Karl Hobley 0daef4ce9e Merge pull request #1528 from hanpama/master
Implement deletion of form submission
2015-08-26 14:06:28 +01:00
Karl Hobley 53e8285ae1 Changelog for #1641 2015-08-26 13:50:09 +01:00
Karl Hobley b0ffeb6e04 Merge pull request #1641 from cca/master
Search signal handler references pk rather than id
2015-08-26 13:47:33 +01:00
Karl Hobley 7f7252bf44 Show total count of found snippets
Rather than just the number on the current page
2015-08-26 13:44:57 +01:00
Karl Hobley 19ab4cae0a Only show search box when snippet is searchable 2015-08-26 13:43:07 +01:00
Matt Westcott 6e4abad2d4 Merge branch 'kaedroho-issue-1397' 2015-08-26 12:05:05 +01:00
Matt Westcott d01421d2d6 Release note for #1605 2015-08-26 12:04:53 +01:00
Matt Westcott 2163e29b68 Merge branch 'issue-1397' of https://github.com/kaedroho/wagtail into kaedroho-issue-1397 2015-08-26 11:29:28 +01:00
Karl Hobley 2497c538b3 Merge pull request #1642 from kaedroho/travis-containers
Use container-based infrastructure on Travis CI
2015-08-26 11:21:24 +01:00
Karl Hobley ca48ac2480 Use container-based infrastructure on Travis CI 2015-08-26 11:03:22 +01:00
Scot Hacker 03c7b9abba Search signal handler references pk rather than id
- Resolves https://github.com/torchbox/wagtail/issues/1640
2015-08-25 15:10:40 -07:00
Matt Westcott 27f52bf4c7 Reorganise filtering logic to be compatible with #1476 2015-08-25 16:36:02 +01:00
Matt Westcott f65d91ad01 Merge branch 'kaedroho-multiple-page-types-in-page-chooser3'
Conflicts:
	CHANGELOG.txt
	docs/releases/1.1.rst
	wagtail/wagtailadmin/views/chooser.py
2015-08-25 16:20:32 +01:00
Matt Westcott e39653c69b Release note for #1621 2015-08-25 16:17:35 +01:00
Matt Westcott 7076e06ce7 Documentation for #1621 2015-08-25 16:15:31 +01:00
Matt Westcott 1410de5c7d Pluralise content_type/pageType parameters for clarity 2015-08-25 15:40:35 +01:00