Commit graph

4092 commits

Author SHA1 Message Date
Dave Cranwell
e9ce32433b allowed block-display help-blocks 2014-07-18 13:07:59 +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
3de545f88d tweak to how help-blocks display 2014-07-18 13:05:23 +01:00
Dave Cranwell
b4087b489c merge master and fixed conflict in typography.scss 2014-07-18 13:04:11 +01:00
Dave Cranwell
4e379610a5 first style pass 2014-07-18 12:54:37 +01:00
Matt Westcott
ba60115d28 More detailed comment about what DbWhitelister does 2014-07-18 12:32:15 +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
Dave Cranwell
4157d49eaa tweaks 2014-07-18 10:23:05 +01:00
Dave Cranwell
439dd600f4 ongoing work to make new settings menu work 2014-07-18 10:20:03 +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
Karl Hobley
5445f584a2 Fixed a broken test 2014-07-17 10:17: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
Karl Hobley
61330ff046 Added tests for frontend serve view and URL generator 2014-07-17 09:50:28 +01:00
Karl Hobley
5632ba85bc Fixes to Python 3 compatibility 2014-07-17 09:25:03 +01:00
Karl Hobley
4c570fd7f6 Added single click to select on URL in URL generator 2014-07-16 17:40:07 +01:00
Karl Hobley
1d492c1b11 Moved URL generator into separate view 2014-07-16 17:31:09 +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
Karl Hobley
38cd5250f0 Improvements to URL generator UI 2014-07-16 16:48:53 +01:00
Karl Hobley
f10d737198 Minor coding style fix 2014-07-16 16:21:13 +01:00
Karl Hobley
a580f7d286 Make generate_signature Python 3 compatible 2014-07-16 16:19:47 +01:00
Karl Hobley
a7610ec7be Added tests for signature generation 2014-07-16 16:19:15 +01:00
Karl Hobley
b13251c67d Added tests for filter spec parsing 2014-07-16 16:11:03 +01:00
Karl Hobley
c51a829865 Added very basic URL generator UI 2014-07-16 15:38:44 +01:00