Wykres commitów

4490 Commity (0921bdec6da519e51ad6975e60820d25d8ec7ac6)

Autor SHA1 Wiadomość Data
Karl Hobley b932ecfb3b Merge pull request #1412 from gasman/fix/url-path-limit
Convert url_path to a text field - fixes #1216
2015-06-16 16:02:14 +01:00
Matt Westcott 7248412d36 Merge branch 'issue-1334' of https://github.com/kaedroho/wagtail into kaedroho-issue-1334 2015-06-16 15:02:11 +01:00
Karl Hobley 0d54e5b2e7 Don't hard code image file size in test 2015-06-16 14:56:15 +01:00
Karl Hobley 0def3c1768 Fixed max upload size error message in multi image uploader 2015-06-16 13:41:33 +01:00
Dave Cranwell 5bcd7841da fixing tests 2015-06-16 13:09:33 +01:00
Dave Cranwell a2f32557cf stream-controls > sequence-controls. Add buttons now have bicolor plus icon. 2015-06-16 13:09:33 +01:00
Dave Cranwell 951dd1eadd tweaks to how css is loaded and how sequences are identified with classes 2015-06-16 13:09:33 +01:00
Dave Cranwell 171631c38d moved streamfield styles to own component and styled to accomodate several common permutations of blocks within blocks, accounting for help text 2015-06-16 13:09:33 +01:00
Matt Westcott 8bd6d65a20 Support overriding form classname and template within StructBlock 2015-06-16 13:09:33 +01:00
Matt Westcott 7c8f14e545 Render help text for structblocks 2015-06-16 13:09:33 +01:00
Matt Westcott 8ee2529bc1 only direct children of streamfield should be made full-width/borderless 2015-06-16 13:09:33 +01:00
Matt Westcott 0d5d50cd12 Make container blocks responsible for rendering the labels of their children 2015-06-16 13:09:32 +01:00
Matt Westcott 5f2574e166 render StructBlock form with a template 2015-06-16 13:09:32 +01:00
Matt Westcott 6226a2bacd Output human-readable label in the header of a streamfield child block 2015-06-16 13:09:32 +01:00
Matt Westcott 4e64a5f3b9 Introduce id_for_label method on Block 2015-06-16 13:09:32 +01:00
Matt Westcott f55b7210ca implement help_text on chooser blocks 2015-06-16 13:08:18 +01:00
Dave Cranwell 3afe8f4f71 translated labels 2015-06-16 13:08:18 +01:00
Dave Cranwell 6f03795e0f tweaks to streamfield controls 2015-06-16 13:08:18 +01:00
Dave Cranwell 478682051c tweaks to when labels are output 2015-06-16 13:08:18 +01:00
Dave Cranwell 75f45cc843 first pass of styling 2015-06-16 13:08:17 +01:00
Matt Westcott 1eea0ba257 add unit test for #1216 2015-06-16 12:44:41 +01:00
Matt Westcott 70100b5b43 Convert url_path to a text field - fixes #1216 2015-06-16 11:45:20 +01:00
Tim Heap a6bbbd11f1 Use six from Django
No point in installing six as a standalone dependency if it is already
bundled with Django.

Fixes #1403
See #1406
2015-06-16 19:28:30 +10:00
Matt Westcott ad4426b84d Merge branch 'issue-1334' of https://github.com/kaedroho/wagtail into kaedroho-issue-1334 2015-06-15 18:50:30 +01:00
Matt Westcott 6b3ddde533 Use correct template tags for `{{ self.intro }}`
Fixes #1404
2015-06-15 18:42:34 +01:00
Matt Westcott 7e89a8e4a2 changelog entry for #1406 2015-06-15 16:26:08 +01:00
Matt Westcott 183f654472 Merge pull request #1406 from kaedroho/issue-1403
Make sure with_metaclass always comes from Django
2015-06-15 16:16:05 +01:00
Karl Hobley 43d3053232 Make sure with_metaclass always comes from Django
Fixes #1403
Fixes #1402
2015-06-15 13:26:38 +01:00
Matt Westcott 0d5cd61b01 Merge pull request #1405 from kaedroho/user-without-username-search
Fix search on user without username
2015-06-15 09:47:50 +01:00
Karl Hobley 5538b73e9e Changelog/release note for #1388 2015-06-15 09:20:20 +01:00
Karl Hobley 0e91aa46fd Merge pull request #1388 from takeflight/feature/no-username
Add support for user models with no username
2015-06-13 13:21:25 +01:00
Karl Hobley 3be8091cbe Merge pull request #1386 from gasman/fix/streamfield-richtext-migration
Support for migrating an existing RichTextField to StreamField
2015-06-13 13:20:55 +01:00
Matt Westcott 1cf7457337 Add tests for raw_text and assignment on StreamField 2015-06-12 20:47:27 +01:00
Matt Westcott fddeb4308b Documentation for migrating a RichTextField to StreamField 2015-06-12 20:33:19 +01:00
Matt Westcott 31f45a8a63 Add a mechanism for preserving the raw text value of StreamFields when they fail to parse as JSON 2015-06-12 20:33:19 +01:00
Karl Hobley 6479eb80ef Merge pull request #1395 from gasman/feature/streamfield-system-check
Add system check to reject invalid block names in StreamField
2015-06-12 15:26:45 +01:00
Karl Hobley 36c124475c Changelog/release note for #1400 2015-06-12 15:25:18 +01:00
Karl Hobley 3738a7d678 Merge pull request #1400 from gasman/fix/underscores-in-slugs
don't strip out underscores from page slugs
2015-06-12 15:20:51 +01:00
Matt Westcott 1a78b19131 don't strip out underscores from page slugs 2015-06-12 14:44:55 +01:00
Matt Westcott ac37c7645b assert that system check errors on blocks return the appropriate field or block 2015-06-12 11:34:09 +01:00
Matt Westcott dae1cf85e4 + whitespace 2015-06-11 13:53:41 +01:00
Matt Westcott f35536ccee stop InvalidStreamModel from polluting the overall model registry 2015-06-11 13:17:04 +01:00
Matt Westcott 0143787fab Add system check to reject invalid block names in StreamField - fixes #1154 2015-06-10 17:21:17 +01:00
Matt Westcott c3c92ebb10 Release note for #1381 2015-06-10 13:43:03 +01:00
Matt Westcott d8c0592feb Merge branch 'kaedroho-issue-1324' 2015-06-10 10:15:47 +01:00
Matt Westcott b456c1fc8a Merge branch 'issue-1324' of https://github.com/kaedroho/wagtail into kaedroho-issue-1324 2015-06-10 10:14:58 +01:00
Karl Hobley da9858fc39 Merge pull request #1390 from kaedroho/template-fixes
Template fixes
2015-06-09 16:25:07 +01:00
Karl Hobley c19e35b2d0 Fixed position of quote character 2015-06-09 15:51:07 +01:00
Karl Hobley 3da4d3a17e Escaped template comments 2015-06-09 15:49:49 +01:00
Karl Hobley 3dd09899ff Fixed import of compress 2015-06-09 15:46:40 +01:00