Commit graph

7416 commits

Author SHA1 Message Date
Karl Hobley
3d314b80ae Installation docs wording tweaks 2015-03-03 10:00:44 +00:00
Matt Westcott
46b77d49a4 Merge branch 'master' of github.com:torchbox/wagtail 2015-03-02 14:26:15 +00:00
Matt Westcott
62e7a95a1a Add logic to enable/disable moveup/movedown buttons at the top/bottom of the list 2015-03-02 14:26:02 +00:00
Karl Hobley
901b68c85f Make test INSTALLED_APPS a tuple 2015-03-02 13:41:32 +00:00
Matt Westcott
33be91d314 implement move up/down buttons for streams 2015-03-02 12:58:46 +00:00
Matt Westcott
2bc9e7bd14 implement move up/down buttons for lists 2015-03-02 12:56:52 +00:00
Dave Cranwell
334c8e6758 merge upstream 2015-03-02 10:47:40 +00:00
Dave Cranwell
5e1ec48df7 textareas should be treated like text inputs 2015-03-02 10:47:01 +00:00
Matt Westcott
5ca8f696a3 make comments about the purpose of 'sequence' more loud and obnoxious 2015-02-27 20:11:46 +00:00
Matt Westcott
1527a3a4a5 sequence_member.html should not contain stream-specific UI elements 2015-02-27 19:46:51 +00:00
Matt Westcott
9a5aaf3288 move menu show/hide logic out of sequence.js and into stream.js's StreamBlockMenu code 2015-02-27 19:36:31 +00:00
Matt Westcott
a52f7ccf1a Assign ID attribute to a stream-menu as a whole.
Use that (plus classnames on each icon button) to attach behaviour to icon buttons, rather than giving each button a globally unique ID. Also change the per-button classname from block-foo to action-add-block-foo, because block-foo is horribly generic and prone to namespace collisions (and providing this as a general-purpose styling hook doesn't seem like a particularly good idea).
2015-02-27 19:04:24 +00:00
Dave Cranwell
4e63ed9569 addressing issue with button text showing 2015-02-27 17:57:11 +00:00
Matt Westcott
fea640fbf3 refactor code for initialising stream menu buttons into a StreamBlockMenu helper object 2015-02-27 17:37:29 +00:00
Matt Westcott
f9a442b28c semicolon pedantry 2015-02-27 17:09:31 +00:00
Matt Westcott
6afc15c395 fix wagtailsnippets_edit URL params on snippet_chooser.
Using target_content_type instead of target_content_type.model apparently meant that we were using the verbose name, causing it to fall over when that contained spaces
2015-02-27 16:18:44 +00:00
Matt Westcott
eb7dd44055 gracefully handle missing model classes in Page.specific() 2015-02-27 16:18:38 +00:00
Dan Braghis
2895aac7f3 Add changelog/release notes for #1022 2015-02-27 14:48:55 +00:00
Dan Braghis
096a24648d Merge pull request #1022 from gasman/feature/custom-page-edit-handler
Allow specifying custom edit handlers for pages - fixes #210
2015-02-27 14:41:45 +00:00
Matt Westcott
40ebd540f6 add TextBlock 2015-02-26 16:41:47 +00:00
Matt Westcott
692901eaa1 Merge branch 'feature/streamfield-choiceblock' 2015-02-26 13:44:22 +00:00
Matt Westcott
4fe11070fa Ensure that ChoiceBlock subclasses are always deconstructed to basic ChoiceBlocks 2015-02-26 13:41:43 +00:00
Matt Westcott
1191643ac6 support choice lists via subclassing ChoiceBlock 2015-02-26 13:18:41 +00:00
Matt Westcott
ea8c52934e Make ChoiceBlock work with named groups
(also, we want a blank option even if required=True; update tests accordingly)
2015-02-26 13:01:02 +00:00
Matt Westcott
e594bf5dee add blank choice to ChoiceBlock when required=False 2015-02-26 12:02:03 +00:00
Matt Westcott
c2836382d5 tests for ChoiceBlock with required=True 2015-02-26 11:48:04 +00:00
Matt Westcott
a1a065ffce implement a basic ChoiceBlock 2015-02-26 11:37:17 +00:00
Karl Hobley
ea47974254 Merge pull request #1020 from gasman/mysql
Fix retrieval of latest page revision on mysql
2015-02-26 09:21:44 +00:00
Dave Cranwell
db79c3f782 fixing tests broken by change of submit buttons 2015-02-26 09:19:36 +00:00
Dave Cranwell
672dac37fa tweak for link buttons 2015-02-25 17:37:44 +00:00
Dave Cranwell
2efd33d67d Merge branch 'master' of github.com:torchbox/wagtail 2015-02-25 17:08:46 +00:00
Dave Cranwell
391ade4ffd improved uniformity of button implementation, improved rendering, prevented object controls on page editor submitting the form. 2015-02-25 17:08:14 +00:00
Matt Westcott
87de5d0c66 update InlinePanel syntax 2015-02-25 10:51:32 +00:00
Dave Cranwell
da72eb103f tweaks to try and get buttons to look right 2015-02-25 09:28:51 +00:00
Karl Hobley
e1af1e4291 Merge pull request #1026 from zerolab/1006-use-unicode-literals
Use unicode literals in models. Fixes #1006
2015-02-25 09:03:38 +00:00
Dan Braghis
0b83f90274 Move from __future__ imports at the beginning of files 2015-02-24 22:23:59 +00:00
Dan Braghis
0fc3fcb550 Add minor PEP8 cleanup 2015-02-24 21:42:11 +00:00
Dan Braghis
c34f6c5fc6 Add unicode_literals import 2015-02-24 21:41:50 +00:00
Matt Westcott
4aea3d108a implement BooleanBlock 2015-02-24 17:03:40 +00:00
Matt Westcott
640cce96ed Merge branch 'master' into feature/streamfield 2015-02-24 15:37:40 +00:00
Dave Cranwell
63139f141f Merge pull request #1025 from zerolab/raise-missing-files-error
Raise missing files error
2015-02-24 12:06:59 +00:00
Matt Westcott
de2dc3d786 documentation for #1022 2015-02-24 11:52:05 +00:00
Dan Braghis
c42882f0a8 Fix ValueError: The 'file' attribute has no file associated with it.
The `ValueError: The 'file' attribute has no file associated with it.`
error is thrown excessively when trying to get the file size. There is
an open and accepted bug as well -
https://code.djangoproject.com/ticket/13327
2015-02-23 22:24:50 +00:00
Dan Braghis
c2f53f3af2 Add error message to doc/image edit view when source missing 2015-02-23 22:00:49 +00:00
Dan Braghis
33d1ac8796 Catch OSError on editing doc with missing source file 2015-02-23 22:00:28 +00:00
Dan Braghis
3bcb5961e3 Add failing test for deleted document source file 2015-02-23 21:59:46 +00:00
Matt Westcott
2e85f779e7 Merge branch 'kaedroho-image-form-fields' 2015-02-23 18:55:02 +00:00
Matt Westcott
81521838c7 Upgrade consideration note for #980 2015-02-23 18:54:44 +00:00
Matt Westcott
4e9712d23c renumber test migration to 0010 2015-02-23 18:17:48 +00:00
Matt Westcott
277f27fdd1 Merge branch 'image-form-fields' of https://github.com/kaedroho/wagtail into kaedroho-image-form-fields
Conflicts:
	wagtail/wagtailimages/tests/tests.py
2015-02-23 18:15:43 +00:00