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

1847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
f471ca623d Improvements to image file validation 2014-07-18 16:42:00 +01:00
Karl Hobley
b29f3851a1 Run validation on uploaded images and display validation errors to the user 2014-07-18 16:26:10 +01:00
Karl Hobley
094a315f21 Fixed a bad URL 2014-07-18 13:06:29 +01:00
Karl Hobley
050a85203e Fixed delete button 2014-07-18 13:05:34 +01:00
Dave Cranwell
a0d79fcff1 removed help, wrong place 2014-07-18 10:29:46 +01:00
Dave Cranwell
f9f0f66738 Merge branch 'master' into feature/multi-image-upload 2014-07-18 10:28:14 +01:00
Dave Cranwell
f4dd085f0f tweaks to help-block contents 2014-07-18 10:27:54 +01:00
Dave Cranwell
c16d0a89f8 added msg 2014-07-18 10:25:53 +01:00
Dave Cranwell
712209ebc2 Merge branch 'master' into feature/multi-image-upload 2014-07-18 10:23:39 +01:00
Matt Westcott
820da2f841 Merge branch 'master' of github.com:torchbox/wagtail 2014-07-17 16:32:28 +01:00
Matt Westcott
9215572b96 rewrite documentation on binding pages to snippets (the linking model should be an inline child of the page, not a snippet itself) 2014-07-17 16:32:17 +01:00
Dave Cranwell
6755b0549b Merge pull request #486 from davecranwell/feature/help-messages 
Added block help messages, suitable for use in any screen where information/instructions need to be conveyed to the user
 2014-07-17 16:18:27 +01:00
Dave Cranwell
5d434130fb using best way of importing other sass 2014-07-17 15:52:55 +01:00
Dave Cranwell
b67bc82c1d moved styleguide css to styleguide folder. added new help text styles 2014-07-17 15:39:22 +01:00
Matt Westcott
4131039ece remove libxml / libxslt from install scripts - not required now we've switched to html5lib 2014-07-17 13:43:14 +01:00
Matt Westcott
81dd7b447c Merge branch 'master' of github.com:torchbox/wagtail 2014-07-17 13:29:41 +01:00
Matt Westcott
87ecbd6171 Merge branch 'kaedroho-html5lib' 2014-07-17 13:29:26 +01:00
Matt Westcott
b700d6503c add html5lib item to changelog + release notes 2014-07-17 13:26:07 +01:00
Matt Westcott
d9b1ac9350 Update test_image_embed_is_rewritten to work on valid HTML input, to make it a more meaningful / representative test 2014-07-17 13:14:06 +01:00
Dave Cranwell
588ae1a4b3 Merge remote-tracking branch 'upstream/master' 2014-07-17 13:02:16 +01:00
Dave Cranwell
0f87becf13 slight glyph metric improvement for users + sites 2014-07-17 13:01:50 +01:00
Dave Cranwell
773f891a09 updated wagtail font with unified user icon and site icon 2014-07-17 12:57:10 +01:00
Matt Westcott
acb2b0bccd Merge branch 'html5lib' of https://github.com/kaedroho/wagtail into kaedroho-html5lib 2014-07-17 12:45:07 +01:00
Matt Westcott
1a9f265354 Merge branch 'kaedroho-remove-embedly-filter' 2014-07-17 12:33:27 +01:00
Matt Westcott
ec47e00e21 Merge branch 'remove-embedly-filter' of https://github.com/kaedroho/wagtail into kaedroho-remove-embedly-filter 
Conflicts:
	wagtail/wagtailembeds/tests.py
 2014-07-17 12:33:13 +01:00
Dave Cranwell
126aab2c80 made TODO clearer 2014-07-17 12:09:24 +01:00
Dave Cranwell
a2a73877e6 added better feedback to users when bad files are uploaded. However this still requires a real message, hence a TODO 2014-07-17 12:00:53 +01:00
Dave Cranwell
c58cf9994c hooked multi-upload into main system, tweaks to messages 2014-07-17 11:30:15 +01:00
Dave Cranwell
f207cd6b52 redirecting browser that don't support file api 2014-07-17 11:09:59 +01:00
Dave Cranwell
363703405a error forms returned from invalid image edit after upload, are now working 2014-07-17 11:02:32 +01:00
Dave Cranwell
af906b9197 fixed hidden field input overlapping main navigation 2014-07-17 10:24:07 +01:00
Dave Cranwell
5b6d8c3831 reduced modernizr to the features we depend on 2014-07-17 10:10:44 +01:00
Karl Hobley
a53e2ced93 Merge pull request #478 from gasman/fix/test-timezones 
Fix scheduled publishing unit tests to not require TIME_ZONE='UTC'
 2014-07-17 09:56:32 +01:00
Matt Westcott
356168f37e Convert go_live_at / expire_at timestamps to the server's own timezone when submitting, so that tests don't need TIME_ZONE='UTC' 2014-07-16 17:21:31 +01:00
Neal Todd
b1c5871ad8 Merge branch 'master' of github.com:torchbox/wagtail 2014-07-16 13:04:58 +01:00
Neal Todd
49db907d13 Fix rogue smart quotes and run explicitly under bash. 2014-07-16 13:04:34 +01:00
Karl Hobley
ba886ce830 Fixes to tests 2014-07-16 09:58:41 +01:00
Karl Hobley
f2a042da66 Changed way JSON responses are built 2014-07-16 09:58:25 +01:00
Karl Hobley
2d238bb989 Merge remote-tracking branch 'torchbox/master' into feature/multi-image-upload 2014-07-16 09:26:43 +01:00
Karl Hobley
c1cad0de6f Added tests for multiple image uploader 2014-07-15 17:46:23 +01:00
Karl Hobley
0cfc4ae94b Pass image_id into confirmation.json (as it was before) 
This is because when the image is deleted, the ID gets unassigned. So "None" gets inserted into the response JSON.
 2014-07-15 17:45:32 +01:00
Karl Hobley
98db7956f2 Some cleanup of images/multiple views 2014-07-15 17:35:19 +01:00
Karl Hobley
f96529ece9 Send back form on validation error of multi image uploader 
This allows validations errors to be displayed on the frontend
 2014-07-15 17:00:59 +01:00
Karl Hobley
0fe9d74efc Pass image object instead of image id into confirmation.json 2014-07-15 16:58:22 +01:00
Karl Hobley
062f027bc3 Use request.method == 'POST' to check if the request is a post request 2014-07-15 16:38:18 +01:00
Karl Hobley
7f21efd55d Added error message if user attempts to POST to multiple/add view without AJAX 2014-07-15 16:28:36 +01:00
Karl Hobley
4019a6be0a Removed a couple of unneeded lines 2014-07-15 16:24:53 +01:00
Karl Hobley
26e42e5529 ImageModel => Image 2014-07-15 16:05:02 +01:00
Karl Hobley
1da6824e67 Cleaned up unused imports 2014-07-15 16:05:02 +01:00
Karl Hobley
969f3de2b7 Added missing import 2014-07-15 16:05:02 +01:00