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
3322 commits 30 branches 112 tags 89 MiB
Commit graph

3322 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Westcott
bfefcf3bb1 treat empty string as an empty value on StreamField too 2015-02-11 13:30:26 +00:00
Matt Westcott
85902d111d implement SnippetChooserBlock 2015-02-11 12:39:44 +00:00
Matt Westcott
dfb2a999f4 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 12:20:38 +00:00
Matt Westcott
76b0964c94 add DocumentChooserBlock 2015-02-11 12:20:32 +00:00
Dave Cranwell
b6436f71b8 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 11:57:52 +00:00
Dave Cranwell
7a5c77702f improved way of specifying text styles for individual blocks or fields within blocks 2015-02-11 11:57:50 +00:00
Matt Westcott
628b7947dc implement ImageChooserBlock 2015-02-11 11:56:43 +00:00
Matt Westcott
887954ec31 Merge branch 'streamfield-chooser-wip' into feature/streamfield 2015-02-11 10:34:35 +00:00
Matt Westcott
e01167ff1f pull re-usable methods of PageChooserBlock into an abstract superclass 2015-02-11 10:34:11 +00:00
Dave Cranwell
d0bbd644bf Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-11 10:31:43 +00:00
Dave Cranwell
dc6b06e585 tweaks to make menu toggle work cleaner 2015-02-11 10:31:40 +00:00
Matt Westcott
d11205454b fix PageChooserBlock to return a page object rather than an ID. 
AdminPageChooser has been tweaked to accept either an ID or an instance as its input value, and FieldBlock now passes the result of value_from_datadict through to_python to deal with the case where the widget doesn't return our expected type.
 2015-02-11 01:21:24 +00:00
Matt Westcott
34bd4bd974 first pass at to_python and get_prep_value on PageChooserBlock 2015-02-10 23:29:20 +00:00
Matt Westcott
19b13a090a Merge branch 'master' into feature/streamfield 
Conflicts:
	wagtail/wagtailadmin/widgets.py
 2015-02-10 16:34:32 +00:00
Matt Westcott
6a31d75aa8 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-10 16:31:28 +00:00
Karl Hobley
22134b414c A couple of tests for ListBlock.render 2015-02-10 16:23:45 +00:00
Matt Westcott
3129d4e029 Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield 2015-02-10 15:52:38 +00:00
Matt Westcott
75c07af32a Additional 0.9 deprecation notes 2015-02-10 15:06:38 +00:00
Matt Westcott
17ccb29371 Merge branch 'feature/chooser-refactor' 2015-02-10 10:44:21 +00:00
Matt Westcott
9a3893798e py3 fix 2015-02-09 21:25:31 +00:00
Matt Westcott
e3dc4a5936 cast an empty string value of AdminChooser to None, as needed by required=True validation 2015-02-09 19:56:51 +00:00
Matt Westcott
13e1811c54 mark chooser_panel.html as deprecated 2015-02-09 19:34:18 +00:00
Matt Westcott
63dafbe4b7 Move the snippet chooser HTML markup from snippet_chooser_panel.html entirely within the AdminSnippetChooser widget's render() method 2015-02-09 19:18:58 +00:00
Matt Westcott
435e4571b3 Move the image chooser HTML markup from image_chooser_panel.html entirely within the AdminImageChooser widget's render() method 2015-02-09 19:08:12 +00:00
Matt Westcott
41577759a1 Move the document chooser HTML markup from document_chooser_panel.html entirely within the AdminDocumentChooser widget's render() method 2015-02-09 18:59:51 +00:00
Matt Westcott
fe797437e7 Remove now-redundant references to page_chooser_panel.html 2015-02-09 18:47:11 +00:00
Matt Westcott
6e2faa0b66 Move the page chooser HTML markup from page_chooser_panel.html entirely within the AdminPageChooser widget's render() method 2015-02-09 18:26:35 +00:00
Karl Hobley
dbe8351b94 Updated tests 2015-02-09 12:59:38 +00:00
Karl Hobley
01534c99c0 Merge pull request #974 from kaedroho/issue-968 
Fixed precision of "fill" operation resizing. Fixes #968
 2015-02-09 12:46:12 +00:00
Karl Hobley
98ca98191d Merge pull request #965 from kaedroho/image-vary-stuff 
Image vary_key related changes
 2015-02-09 12:46:03 +00:00
Karl Hobley
d4ab7e833f Changelog, release notes and contributor entry for #620 2015-02-09 12:39:12 +00:00
Karl Hobley
46e006dbd2 Merge branch 'tucarga-fix-richtext' 2015-02-09 12:36:29 +00:00
Karl Hobley
89bb3787e3 Improvements to #620 
As per https://github.com/torchbox/wagtail/pull/620#issuecomment-59203932

Also improved the tests a little bit
 2015-02-09 12:35:19 +00:00
Alejandro Varas
357a5c7449 Fixed TypeError raised by richtext template tag 2015-02-09 11:01:41 +00:00
Karl Hobley
cee7b891a7 Merge pull request #971 from benjaoming/patch-1 
Remove unused import Image
 2015-02-08 14:12:51 +00:00
Karl Hobley
b2b790e387 Improved precision of "fill" operation resizing 
Fixes #968
 2015-02-08 13:57:07 +00:00
Karl Hobley
a8f53c4b03 Added a failing test for #968 2015-02-08 13:40:35 +00:00
benjaoming
f4b1a3938a Remove unused import Image 
Don't see this used anywhere...!?
 2015-02-06 21:28:34 -08: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
Matt Westcott
8f655cd74d make WidgetWithScript explicitly fail in the absence of an ID attribute 2015-02-06 17:07:30 +00:00
Karl Hobley
9d9bfc1f08 Merge pull request #969 from kaedroho/warnings-fixes 
Some warnings fixes
 2015-02-06 17:06:10 +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
Matt Westcott
f56d927be0 provide a render_html method on WidgetWithScript so that subclasses can override the HTML part of the rendering too 2015-02-06 16:40:51 +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
Matt Westcott
55c585d03e Update *_chooser_panel.html templates so that they don't have to be passed an is_chosen flag 2015-02-06 16:09:28 +00:00
Karl Hobley
8103f5ff8b Fixed block tests 2015-02-06 15:56:33 +00:00