Commit graph

4233 commits

Author SHA1 Message Date
Karl Hobley
1df5bb08fb Merge pull request #1357 from gasman/fix/embedblock-render
Make EmbedBlock use a custom type that knows its own rendering - fixes #1098
2015-06-03 09:31:54 +01:00
Karl Hobley
d51fb9c4ba Merge pull request #1364 from gasman/fix/rawhtmlblock-render
Make RawHTMLBlock consistently use SafeText as its native value
2015-06-03 09:23:08 +01:00
Matt Westcott
992f4cafbe Release note for #1272 2015-06-02 16:48:33 +01:00
Matt Westcott
9ef1e6a1df Merge branch 'master' of https://github.com/torchbox/wagtail 2015-06-02 16:35:43 +01:00
Matt Westcott
4f378c6ba5 Merge branch 'kaedroho-searchresults-tests' 2015-06-02 16:35:32 +01:00
Matt Westcott
e3f6c17758 Merge branch 'searchresults-tests' of https://github.com/kaedroho/wagtail into kaedroho-searchresults-tests 2015-06-02 16:31:18 +01:00
Dan Braghis
04ddfc0b3c Merge pull request #1363 from kaedroho/remove-sendfile-dependency
Removed sendfile dependency
2015-06-02 16:12:55 +01:00
Matt Westcott
60bafb3d2b Use six.text_type with RawHTMLBlock to fix unicode on Py2 2015-06-02 12:42:28 +01:00
Chris Rogers
5f1e9faa4f Merge pull request #1356 from davecranwell/fixes-for-ie10and11
fixing #1342, #1343, #1344 - issues with IE10/11
2015-06-02 12:16:40 +01:00
Karl Hobley
5f012c8ca8 Merge pull request #1360 from gasman/fix/richtext-block-rendering
Add a 'RichText' value type, and use it as the native value of RichTextBlock
2015-06-02 11:21:35 +01:00
Matt Westcott
8f1f4ad82a Use assertIsInstance instead of assertTrue(isinstance) 2015-06-01 19:10:00 +01:00
Matt Westcott
18e3a215f0 Use assertIsInstance instead of assertTrue(isinstance) 2015-06-01 19:07:17 +01:00
Matt Westcott
fb2850403f Test that serialized value of RawHTMLBlock is not SafeData 2015-06-01 18:45:35 +01:00
Matt Westcott
db59fb5bc6 test SafeData rather than SafeText for py2 compatibility (and use assertIsInstance) 2015-06-01 18:45:35 +01:00
Matt Westcott
ce590531be Make RawHTMLBlock consistently use SafeText as its native value 2015-06-01 18:24:53 +01:00
Matt Westcott
c685fdd905 python2 unicode fix 2015-06-01 17:40:39 +01:00
Matt Westcott
f6b8e13a0c python2 unicode fix 2015-06-01 17:31:27 +01:00
Karl Hobley
7fafc63ce0 Fix typo 2015-06-01 16:55:55 +01:00
Karl Hobley
8c75baa271 Removed sendfile dependency
Not actually needed unless you're setting a SENDFILE_BACKEND and in that case, you'll know you need it.
2015-06-01 16:49:12 +01:00
Karl Hobley
3b26ddc162 Fixed module names for a few classes 2015-06-01 16:03:59 +01:00
Matt Westcott
9a864ff6c9 split up tests for RichText() and RichTextBlock.get_default() 2015-06-01 14:46:24 +01:00
Matt Westcott
1c510a04c8 RichText should not be imported from wagtailcore.blocks 2015-06-01 14:40:51 +01:00
Dan Braghis
be3be40389 Release/changelog notes for #1109 2015-06-01 14:30:07 +01:00
Dan Braghis
b13951b5cf Merge pull request #1109 from kaedroho/vanilla-project-template
Vanilla project template
2015-06-01 14:17:36 +01:00
Karl Hobley
9df9261f4f Fixed a couple of links in editor manual
This should fix PDF builds as well
2015-06-01 14:12:48 +01:00
Matt Westcott
4da28acb2a Add a 'RichText' value type, and use it as the native value of RichTextBlock
This means that they consistently render as rich text regardless of how they are output onto the template (as a child of StreamBlock or StructBlock; with or without a |richtext filter).
2015-06-01 13:59:32 +01:00
Karl Hobley
a6f28826bd Merge pull request #1358 from kaedroho/customisation-docs
Added customisation section to the docs
2015-06-01 12:36:42 +01:00
Karl Hobley
eec194f154 Added missing "versionadded" 2015-06-01 09:54:17 +01:00
Karl Hobley
0b0a97ff28 Update 1.0.rst 2015-06-01 09:52:29 +01:00
Karl Hobley
82c04f56f6 Fix typo 2015-06-01 09:51:08 +01:00
Karl Hobley
f9f6d52670 Moved page editor customisation to customisation section 2015-05-30 23:17:39 +01:00
Karl Hobley
5d52ae949d Added customisation section 2015-05-30 23:10:48 +01:00
Matt Westcott
7938099a21 Merge branch 'bgrace-feature/optional-richtextblocks' 2015-05-30 11:20:24 +01:00
Matt Westcott
15a5f7494c Merge branch 'feature/optional-richtextblocks' of https://github.com/bgrace/wagtail into bgrace-feature/optional-richtextblocks 2015-05-30 11:17:16 +01:00
Matt Westcott
1167cd0484 Make StructBlock.clean return a StructValue, not a dict - fixes #1355 2015-05-29 21:12:58 +01:00
Matt Westcott
0917ddc1c9 Rewrite EmbedBlock to use a custom EmbedValue type as its native value, so that embed rendering works for children of StructBlocks too 2015-05-29 17:25:31 +01:00
Dave Cranwell
44d0d20594 fixing 1342, 1343, 1344 - issues with IE10/11 2015-05-29 17:16:05 +01:00
Karl Hobley
3188fc031a Added a link to AUTO_UPDATE docs from release notes 2015-05-29 17:00:09 +01:00
Matt Westcott
f5218910c4 Merge branch 'kaedroho-search-auto-update' 2015-05-29 16:24:38 +01:00
Matt Westcott
e2a44fe0a5 release note for #1349 2015-05-29 16:24:23 +01:00
Matt Westcott
eaa100367f Merge branch 'search-auto-update' of https://github.com/kaedroho/wagtail into kaedroho-search-auto-update 2015-05-29 15:58:29 +01:00
Karl Hobley
9885d2fb7d Fix typos 2015-05-29 14:21:08 +01:00
Karl Hobley
d0df0c225b Merge pull request #1352 from gasman/block-value-conversion
Make Block value type handling more consistent
2015-05-29 14:06:26 +01:00
Karl Hobley
1e0a203f86 Added tests for get_search_backends 2015-05-29 14:05:11 +01:00
Karl Hobley
77d143a099 Some edits to model reference 2015-05-29 12:53:48 +01:00
Karl Hobley
16315403fc Added upgrade consideration for admin_form_fields 2015-05-29 12:05:52 +01:00
Karl Hobley
afda401956 Document admin_form_fields 2015-05-29 11:57:25 +01:00
Karl Hobley
c670f1a8e7 Indexing {non-page => custom} models 2015-05-29 11:23:31 +01:00
Karl Hobley
e4ee711043 Removed Pagination from the example search view
Makes the searching bit easier to see. Leave pagination as an exercise for the reader
2015-05-29 11:20:05 +01:00
Karl Hobley
e7c61b13b1 Improve docs for WAGTAILSEARCH_BACKENDS setting
Including docs for new AUTO_UPDATE parameter
2015-05-29 11:04:54 +01:00