Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-23 16:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3543 commits 30 branches 112 tags 89 MiB
Commit graph

3543 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Matt Westcott
a8ec3b1af7 specify DATABASE_USER 2015-02-23 16:06:40 +00:00
Matt Westcott
c46e97c9ce pass DATABASE_HOST=localhost for mysql tests 2015-02-23 15:37:02 +00:00
Matt Westcott
0b31f9933f enable tox tests for mysql 2015-02-23 15:33:36 +00:00
Matt Westcott
4948b18e29 Use -id as a secondary key when retrieving latest page revision. 
This fixes various unit tests on MySQL, where multiple revisions are committed in the space of one second, and the resolution of the created_at timestamp is insufficient to distinguish them.
 2015-02-23 15:33:36 +00:00
Karl Hobley
8dc8e9ca99 Merge pull request #1024 from gasman/fix/drone-settings-cleanup 
Clean up drone settings a bit more from #1021
 2015-02-23 15:28:17 +00:00
Matt Westcott
8e671dfeaa remove outdated comment re Drone 2015-02-23 15:25:02 +00:00
Matt Westcott
fc12d86279 Drone should pass in relevant settings instead of a RUNNING_IN_DRONE flag 2015-02-23 15:10:22 +00:00
Karl Hobley
cde56af073 Merge pull request #1021 from kaedroho/drone-cleanup 
Cleaned up drone settings
 2015-02-23 14:44:49 +00:00
Karl Hobley
f2f57fba73 Cleaned up drone settings 2015-02-23 14:38:11 +00:00
Tom Dyson
4e7b9bfd98 Merge pull request #1019 from zerolab/remove-build-dependencies 
Remove build dependencies. Fixes #985 and #958
 2015-02-23 11:20:29 +00:00
Dan Braghis
352281a1e0 Separate dependencies in two subsections 2015-02-23 11:13:37 +00:00
Dan Braghis
423dcb28b0 Replace dependency list with link to setup.py 
And separate dependencies into 'barebones' and 'admin ui'
 2015-02-23 11:11:50 +00:00
Dan Braghis
99f94baa4a Add changelog/release notes for #935/#1013 2015-02-23 10:01:38 +00:00
Dan Braghis
f680588b7d Merge pull request #1013 from kaedroho/issue-935 
Catch OSErrors when getting image file size. Fixes #935
 2015-02-23 09:56:55 +00:00
Dan Braghis
69836e5970 Minor docs cleanup 2015-02-22 11:29:24 +00:00
Dan Braghis
318ba87117 Add dependencies subsection with notes on libsass and Pillow 2015-02-22 11:27:12 +00:00
Karl Hobley
55c8a0712f Merge pull request #1017 from mattbrailsford/add-parent_page_types-docs 
Update page.rst - parent_page_types/subpage_types docs
 2015-02-22 11:11:49 +00:00
Karl Hobley
4d3f262b98 Remove built dependencies 
This commit removes libsass and Pillow from the setup.py dependency list. This greatly improves install performance and also means that the basic Wagtail installation is pure-python (so no build tools need to be on the end users host machine).

None of these dependencies are directly called from within Wagtail so the start project command continues to work correctly.
 2015-02-22 10:25:53 +00:00
Matt Westcott
474db433f9 implement DateBlock, TimeBlock, DateTimeBlock 2015-02-21 16:51:56 +00:00
Matt Brailsford
08a5ac9b36 Update page.rst 
Added parent_page_types docs and updated subpage_types docs to include instructions on blocking child page creation altogether.
 2015-02-21 10:05:41 +00:00
Matt Westcott
e342ad5580 Merge branch 'davecranwell-feature/chooser-panel-edit-links-2' 2015-02-20 15:46:01 +00:00
Matt Westcott
d7e1fd497e release note for #1014 2015-02-20 15:45:38 +00:00