Commit graph

807 commits

Author SHA1 Message Date
Dave Cranwell
2aaec7c332 reordered fields 2014-05-20 14:38:22 +01:00
Dave Cranwell
7b98664cd0 unrelated fix for IE 2014-05-20 13:22:32 +01:00
Dave Cranwell
27333b1ea1 updated formbulider fields with identifyable class names, although not output yet 2014-05-20 13:22:19 +01:00
Dave Cranwell
7d88d285cd updated login styles to match new 'iconfield' implementation 2014-05-20 10:41:08 +01:00
Dave Cranwell
05cbcd7546 merging master 2014-05-20 10:28:03 +01:00
Dave Cranwell
4111baf933 font size fix for login form icons 2014-05-20 10:25:14 +01:00
Dave Cranwell
3a0285fae4 Merge remote-tracking branch 'upstream/master' 2014-05-20 10:16:36 +01:00
Dave Cranwell
eb704fc5a9 added scrollable form submissions tables 2014-05-20 10:11:03 +01:00
Karl Hobley
7c99fa664c Don't check internal file formatl if image is closed 2014-05-19 11:38:22 +01:00
Karl Hobley
e4401ba44a Revert "Reopen images for validation if they are closed"
This reverts commit 7d43b1cf6e.
2014-05-19 11:37:13 +01:00
Karl Hobley
7159d246d8 Merge branch 'image-validation-fix' 2014-05-19 10:53:07 +01:00
Karl Hobley
7d43b1cf6e Reopen images for validation if they are closed 2014-05-19 10:52:49 +01:00
Karl Hobley
e00bf58914 Merge pull request #252 from kaedroho/image-validation-fix
More robust image file validation
2014-05-19 09:59:13 +01:00
Karl Hobley
b0c069d446 More robust image file validation
Previously, it was possible to upload PSD files by simply renaming them to have a '.jpg' extension.

This causes issues as wagtailimages cannot resize PSD files causing crashes.

This commit fixes this by validating that the internal format of the file matches the extension.
2014-05-19 09:56:49 +01:00
Matt Westcott
7a9e214fb5 Remove dead code for creating pages by type and then location; it's been unused since wagtail 0.1, hasn't been updated for the page permission model, and needs further spec / discussion (including a working subpage_types implementation) before it can return 2014-05-17 16:00:19 +02:00
Matt Westcott
f2b6b01838 Merge branch 'sixpearls-fix/remove_raw_sql' 2014-05-17 15:12:43 +02:00
Matt Westcott
ed36f25bff Add Ben Margolis to contributors 2014-05-17 15:12:18 +02:00
Matt Westcott
ac5e903c5e Merge branch 'fix/remove_raw_sql' of https://github.com/sixpearls/wagtail into sixpearls-fix/remove_raw_sql 2014-05-17 15:00:13 +02:00
Matt Westcott
9c5a88e581 Merge branch 'kaedroho-tests-changes' 2014-05-17 12:11:23 +02:00
Matt Westcott
398a208066 Merge branch 'tests-changes' of https://github.com/kaedroho/wagtail into kaedroho-tests-changes 2014-05-17 11:49:22 +02:00
Ben Margolis
09f185b3aa Remove all (3) raw SQL statements. This will allow Django to generate the statements, so there aren't any backend issues 2014-05-15 15:29:23 -07:00
Dave Cranwell
49c5f762df fixing height of header 2014-05-13 17:19:41 +01:00
Karl Hobley
5474f7ef39 Embeds: Catch TypeErrors when casting width and height to integers 2014-05-13 17:18:33 +01:00
Dave Cranwell
f4588a3668 ongoing tweaks to how fields are rendered 2014-05-13 17:03:31 +01:00
Dave Cranwell
6f5203c6fd Medium-scale changes to fields to allow 'iconfields' and header refactored into own css file 2014-05-13 15:51:28 +01:00
Dave Cranwell
aa41a5e8a9 updating header form style 2014-05-13 12:45:49 +01:00
Dave Cranwell
0da3fa85d7 updated templates so that pagination of form pages is possible as well as pagination of submissions 2014-05-13 12:19:04 +01:00
Dave Cranwell
c69df32deb tweaks to all forms globally, to use left-aligned labels at desktop resolutions 2014-05-13 11:28:01 +01:00
Matt Westcott
1ecc215759 Add mechanism for apps to register their own hallo.js plugins 2014-05-10 23:54:32 +01:00
Matt Westcott
4785a41c38 Move chooserUrls definitions into their respective apps 2014-05-10 23:42:49 +01:00
Matt Westcott
fd737f0ab0 Have wagtaildocs, wagtailembeds, wagtailimages and wagtailsnippets register their page editor JS components through the insert_editor_js hook, rather than hard-coding them into _editor_js.html 2014-05-10 19:35:51 +01:00
Karl Hobley
4786e34a46 Import unittest2 from Django 2014-05-10 13:21:21 +01:00
Karl Hobley
27debc3289 Fixed crash when an invalid width is send by oembed provider 2014-05-09 12:59:25 +01:00
Matt Westcott
64357dc5e0 Merge branch 'master' into form-builder
Conflicts:
	wagtail/tests/fixtures/test.json
	wagtail/wagtailcore/tests.py
2014-05-09 09:57:40 +01:00
Dave Cranwell
af20a61b6b reducing shadow on menu. looked amateurish 2014-05-08 12:31:49 +01:00
Dave Cranwell
280d960829 fixing save button on page creation 2014-05-08 12:10:06 +01:00
Dave Cranwell
6acb81dc78 Merge branch 'feature/pagemodes' 2014-05-08 11:56:46 +01:00
Dave Cranwell
96b6845e72 updated drop-ups for new preview button. improved icon rendering on windows generally. 2014-05-08 11:52:39 +01:00
Matt Westcott
541c4b37ff use url_info.hostname rather than url_info.netloc when building dummy request headers - netloc includes port number for non-standard ports, which we don't want 2014-05-08 10:55:47 +01:00
Dave Cranwell
532309d9eb Merge remote-tracking branch 'upstream/feature/pagemodes' into feature/pagemodes 2014-05-08 09:39:28 +01:00
Matt Westcott
9b93d7edd8 Add unit tests for wagtailforms backend 2014-05-07 17:33:13 +01:00
Matt Westcott
f68f9a0461 add tests for front-end form submission 2014-05-07 16:39:56 +01:00
Matt Westcott
738fa90e19 enforce permission restrictions on retrieving form submissions 2014-05-06 17:34:31 +01:00
Matt Westcott
d89f8711a7 add editable_pages method to UserPagePermissionsProxy 2014-05-06 16:55:49 +01:00
Matt Westcott
b56c726733 add migration for wagtailforms 2014-05-06 16:28:42 +01:00
Matt Westcott
dd087d0820 Remove ConcreteForm models from wagtailforms 2014-05-06 15:02:44 +01:00
Matt Westcott
82aa2ea4c5 Make to_address optional (so that the page author can decide whether or not to make use of the email functionality, without needing two versions of the template) 2014-05-06 14:44:41 +01:00
Matt Westcott
2f67c986eb Give fields their own columns in the form data view 2014-05-06 12:45:24 +01:00
Matt Westcott
08f6713d96 Don't capture logged-in user in form submissions (not clear how useful it will be, and creates possible privacy issues where submissions are intended to be anonymous) 2014-05-06 12:31:56 +01:00
Matt Westcott
424f48b644 Refactor CSV output to display data columns in original order 2014-05-02 17:03:37 +01:00