Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 09:13:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3258 commits 30 branches 112 tags 89 MiB
Commit graph

3258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
22134b414c A couple of tests for ListBlock.render 2015-02-10 16:23:45 +00:00
Karl Hobley
dbe8351b94 Updated tests 2015-02-09 12:59:38 +00:00
Dave Cranwell
53b854d4cc name used instead of label 2015-02-06 17:37:01 +00:00
Dave Cranwell
c5ee808d15 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-06 17:34:45 +00:00
Dave Cranwell
4b22ede9d5 classes on fields now prefixed to avoid pollution 2015-02-06 17:34:43 +00:00
Karl Hobley
63c11ff1d1 Minor HTML fix 2015-02-06 16:50:32 +00:00
Karl Hobley
444328601f Added EmbedBlock 2015-02-06 16:49:09 +00:00
Dave Cranwell
7fd561554a Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-06 16:12:41 +00:00
Dave Cranwell
2ba563b04c ongoing tweaks to allow text to have formatting 2015-02-06 16:12:39 +00:00
Karl Hobley
8103f5ff8b Fixed block tests 2015-02-06 15:56:33 +00:00
Karl Hobley
5b470257e7 Put label back the way it was 2015-02-06 15:45:21 +00:00
Karl Hobley
570cdc560b Fixed Meta classes on Python 2 2015-02-06 15:29:12 +00:00
Karl Hobley
2f0a438502 Added meta classes 2015-02-06 15:29:11 +00:00
Dave Cranwell
2cb8244810 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-06 15:14:56 +00:00
Dave Cranwell
185cf42f63 styling of fields according to design 2015-02-06 15:14:54 +00:00
Karl Hobley
446a9868dc Removed some stray code 2015-02-06 13:04:19 +00:00
Karl Hobley
18a4722b51 Tests for html_declarations 2015-02-06 12:59:01 +00:00
Dave Cranwell
98a99b0fe7 ongoing layout tweaks 2015-02-06 09:58:36 +00:00
Dave Cranwell
c0f74d5a5f accidentally discovered a nifty transition effect 2015-02-05 17:44:50 +00:00
Dave Cranwell
0938e8c281 tweaks to how stream menus show/hide 2015-02-05 17:10:27 +00:00
Dave Cranwell
6babbe37f2 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 16:49:51 +00:00
Dave Cranwell
35e9bfc2ce ongoing stream menu work 2015-02-05 16:49:49 +00:00
Matt Westcott
91dd196a24 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 16:34:00 +00:00
Matt Westcott
e223cac658 call expand_db_html in the native rendering of RichTextBlock 2015-02-05 16:33:52 +00:00
Karl Hobley
0cff753544 Blocks tests tweaks 2015-02-05 16:26:39 +00:00
Matt Westcott
f3a66d34af implement RichTextBlock, and ensure that script tags embedded in html_declarations bodies are properly escaped 2015-02-05 16:23:31 +00:00
Karl Hobley
863cffeb36 Tests for StreamBlock 2015-02-05 16:04:29 +00:00
Dave Cranwell
144a130e44 stream menu should use label for the button it creates 2015-02-05 15:53:53 +00:00
Dave Cranwell
151a8da6d9 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 15:42:54 +00:00
Dave Cranwell
f04c407ffb add suitable icons to wagtail's own icon set and allowing user to define icon for each streamfield block 2015-02-05 15:42:52 +00:00
Karl Hobley
161aa50a9e Test tweaks 2015-02-05 15:33:42 +00:00
Matt Westcott
959feec13a Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 15:02:42 +00:00
Matt Westcott
2ad0366fa0 make the base Block.render template-aware, so that any subclass can define a 'template' property to override the default rendering (which is now provided by block.render_basic()) 2015-02-05 15:00:56 +00:00
Karl Hobley
c115addf1a Added tests for ListBlock 2015-02-05 13:09:50 +00:00
Matt Westcott
3f82c1bc0b Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 12:31:34 +00:00
Matt Westcott
ac1bee89c9 Have StreamChild.__str__ return the child's native rendering so that it's usable on templates. (StreamChild isn't just syntactic sugar after all, then...) 2015-02-05 12:31:24 +00:00
Karl Hobley
bafd5dca3c Tests for StructBlock 2015-02-05 12:30:15 +00:00
Matt Westcott
6f1740b08b add some syntactic sugar so that we can refer to child.block_type when looping over a StreamValue 2015-02-05 12:23:26 +00:00
Matt Westcott
26d6022752 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-05 12:08:40 +00:00
Matt Westcott
94a248055b Refactor StreamValue so that it behaves as a sequence of BoundBlocks rather than a sequence of values 2015-02-05 12:08:33 +00:00
Karl Hobley
36ed0ec99d Added tests for FieldBlock 2015-02-05 11:48:37 +00:00
Dave Cranwell
67b0ffd09c beginning styling of stream menus 2015-02-05 11:40:37 +00:00
Matt Westcott
2a485e499e define the default value of a StreamBlock to be an empty StreamValue, not a list 2015-02-05 11:22:17 +00:00
Matt Westcott
89e5f74521 StreamField.to_python needs to return an empty StreamValue for None, not an empty list 2015-02-05 11:12:21 +00:00
Matt Westcott
53e1ee44e5 ditch HeadingBlock in favour of a CharBlock that doesn't know its own native rendering 2015-02-05 10:46:59 +00:00
Matt Westcott
0afb1a3b50 make StreamField behave correctly for migrations 2015-02-04 19:03:15 +00:00
Matt Westcott
7f3c0f5af0 Pick up the StreamBlock definition from the model field, so that we don't need to pass it to the StreamFieldPanel constructor 2015-02-04 16:56:35 +00:00
Matt Westcott
00f50781d1 Merge branch 'master' into feature/streamfield-frontend 
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
 2015-02-04 16:47:14 +00:00
Karl Hobley
88812b4cae Release notes for #957 and #960 2015-02-04 16:17:16 +00:00
Karl Hobley
ed6e13f171 Changelogs for #957 and #960 2015-02-04 16:15:58 +00:00