Wykres commitów

2183 Commity (0b3515a91669f229469ea80c0a77f810760afb29)

Autor SHA1 Wiadomość Data
Matt Westcott dc62ebe3a1 Merge branch 'kaedroho-unpublish_signal' 2014-07-22 11:09:59 +01:00
Matt Westcott 6a01b640f8 add changelog/release notes for page_published signal 2014-07-22 11:09:02 +01:00
Matt Westcott 633dd8243f Fix test failure (fetch specific_class and specific_page before deleting page) 2014-07-22 11:08:46 +01:00
Karl Hobley b693ed7b39 Fire unpublished_signal after unpublishing the page 2014-07-22 10:59:01 +01:00
Karl Hobley c8f1f82914 Merge branch 'master' into unpublish_signal
Conflicts:
	wagtail/wagtailadmin/views/pages.py
2014-07-22 09:49:23 +01:00
Karl Hobley 9fc905c5a1 Don't fire page_unpublished signal when deleting non-live pages 2014-07-22 09:47:21 +01:00
Matt Westcott 00046639c7 Added routable page to release notes and changelog 2014-07-21 16:03:28 +01:00
Matt Westcott f273331d38 Copyediting of routable_page docs, and longer explanation of what you would use it for 2014-07-21 15:52:19 +01:00
Matt Westcott 94f0f9bc61 Merge branch 'superpage' of https://github.com/kaedroho/wagtail into kaedroho-superpage 2014-07-21 13:27:06 +01:00
Karl Hobley 48845bad8e Rewrote superpage to no longer need core changes 2014-07-18 17:40:04 +01:00
Karl Hobley 152d02d6f2 Revert "Fixed broken test"
This reverts commit 911ba9ec06.
2014-07-18 17:32:50 +01:00
Karl Hobley 060219ee48 Revert "Allow RouteResult to return a view"
This reverts commit bbbc83c56e.
2014-07-18 17:32:41 +01:00
Dave Cranwell 5d86d95a21 fixing issue where all forms would submit at once 2014-07-18 17:31:49 +01:00
Dave Cranwell f8dc380952 merged master, fixing conflict in core.js 2014-07-18 17:18:20 +01:00
Karl Hobley a1c5dbd12c Updated image file validation error message 2014-07-18 17:12:28 +01:00
Karl Hobley 78cbf657dc Fixed python 3 error 2014-07-18 17:09:46 +01:00
Karl Hobley 133e0c8547 Fixed typo 2014-07-18 16:58:38 +01:00
Karl Hobley adb8141a50 Added test for #429 2014-07-18 16:55:33 +01:00
Karl Hobley abce45477e Updated tests 2014-07-18 16:42:15 +01:00
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 5b99f38927 Added changelog and release notes for #429 2014-07-18 15:14:36 +01:00
Karl Hobley eeeff3e05c Merge pull request #429 from davecranwell/feature/ajax-explorer-menu
Ajax explorer menu
2014-07-18 15:06:59 +01:00
Karl Hobley b1d412f0f6 Set cache expire headers to two months on frontend image serve view 2014-07-18 14:58:34 +01:00
Dave Cranwell 055233bbd7 added message about particularly large images 2014-07-18 13:17:53 +01:00
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
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