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
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
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
Matt Westcott
ba60115d28
More detailed comment about what DbWhitelister does
2014-07-18 12:32:15 +01:00
Dave Cranwell
f4dd085f0f
tweaks to help-block contents
2014-07-18 10:27:54 +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
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
227765359b
Lots of small tweaks to docs
2014-07-15 14:16:46 +01:00
Karl Hobley
0b8fab6f42
Retitled routable_page doc, added to index
2014-07-15 13:48:05 +01:00
Karl Hobley
7f66d1a46d
Improvements to subpage_urls docs
2014-07-15 13:45:42 +01:00
Karl Hobley
b0302d5e2d
Fixes to documentation of Page attributes
2014-07-15 13:39:11 +01:00
Karl Hobley
6603c63b95
Use SQLite3 database backend when building docs
...
This prevents Django from loading psycopg2 when running autodocs on models files
2014-07-15 13:05:24 +01:00
Karl Hobley
d1d8b7811a
Added requirements file for docs
2014-07-15 12:39:42 +01:00
Matt Westcott
d0c265f9b7
Merge pull request #470 from takeflight/feature/admin-hook-decorator
...
Return the function again from the hook decorator
2014-07-15 09:17:33 +01:00
Neal Todd
da996c6f06
Typo fix (led to incorrect file beig created).
2014-07-15 09:10:29 +01:00
Tim Heap
edd8ac2d77
Return the function again from the hook decorator
...
The decorator variant of hook registration did not return anything,
meaning that the decorated function would end up being `None`. This was
not noticed, as the functions are rarely called manually, as opposed to
being invoked via the hook.
2014-07-15 16:09:11 +10:00
Matt Westcott
d8fad0c207
Merge branch 'takeflight-feature/admin-hook-decorator'
2014-07-14 18:31:39 +01:00
Matt Westcott
493d45693f
update wagtail_hooks across all wagtail subapps to use decorator syntax
2014-07-14 18:31:26 +01:00
Matt Westcott
f91cc8d7d5
update docs to use decorator syntax for hooks
2014-07-14 18:25:14 +01:00
Matt Westcott
27260ab8ad
Merge branch 'feature/admin-hook-decorator' of https://github.com/takeflight/wagtail into takeflight-feature/admin-hook-decorator
2014-07-14 17:57:53 +01:00
Karl Hobley
a855749f5e
Started RoutablePage docs
2014-07-14 15:09:22 +01:00
Karl Hobley
911ba9ec06
Fixed broken test
...
Caused by adding view into RouteResult
2014-07-14 14:08:09 +01:00
Karl Hobley
023579dc6b
Added RoutablePage
2014-07-14 13:37:27 +01:00
Matt Westcott
68c5e1dff8
Merge branch 'stable/0.4.x'
...
Conflicts:
docs/releases/index.rst
2014-07-14 13:14:53 +01:00
Matt Westcott
0d5f0172eb
add release notes / changelog entry for 0.4.1
2014-07-14 13:12:04 +01:00
Karl Hobley
bbbc83c56e
Allow RouteResult to return a view
2014-07-14 12:47:24 +01:00
Karl Hobley
cc446f0e97
FORCE_NEW is not used in Elasticsearch-py
2014-07-14 12:27:33 +01:00
