Commit graph

1795 commits

Author SHA1 Message Date
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
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
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
cc446f0e97 FORCE_NEW is not used in Elasticsearch-py 2014-07-14 12:27:33 +01:00
Karl Hobley
930833324d Fixed backwards compatibility with Elasticsearch URLs setting 2014-07-14 12:27:25 +01:00
Tom Dyson
494a26b731 consistent editors / editor's / Editor's 2014-07-14 11:31:27 +01:00
Matt Westcott
51c6f251e2 Made contents a bit smaller 2014-07-14 11:30:54 +01:00
Dave Cranwell
be0080a8af Update private_pages.rst 2014-07-14 11:30:00 +01:00
Tom Dyson
6f1a78bedf python -> Python 2014-07-14 11:29:20 +01:00
Dave Cranwell
812daf0662 Added contents 2014-07-14 11:27:04 +01:00
Tom Dyson
6b3693f355 Typos in 0.4 release notes 2014-07-14 11:26:39 +01:00
Karl Hobley
8ab347632a Fixed test which broke under html5lib
The test used HTML which wasn't valid HTML5. html5lib corrects these errors whereas lxml didn't so the result of the test is different.
2014-07-11 16:44:45 +01:00
Karl Hobley
ac6292d614 Replaced lxml with html5lib 2014-07-11 16:40:36 +01:00
Karl Hobley
67aa7f9406 Merge pull request #464 from kaedroho/makemessages
Rerun makemessages
2014-07-11 14:43:58 +01:00
Karl Hobley
5f83b4a423 Improvements to PageQuerySet docs 2014-07-11 14:25:14 +01:00
Karl Hobley
9958b67acc Merge pull request #391 from kaedroho/autodoc
Enable autodoc sphinx extension. Document PageQuerySet
2014-07-11 12:55:08 +01:00
Karl Hobley
1be09f2e1a Improvements to Page documentation 2014-07-11 12:50:35 +01:00
Karl Hobley
c05211d684 Improvements to PageQuerySet docs 2014-07-11 12:39:56 +01:00
Karl Hobley
4bfd0e5a20 Merge branch 'master' into autodoc
Conflicts:
	runtests.py
2014-07-11 12:23:25 +01:00
Karl Hobley
1ddf5651ba Run makemessages on wagtailstyleguide 2014-07-11 11:57:36 +01:00
Karl Hobley
a90bd0b0f1 Rerun makemessages on wagtailsnippets 2014-07-11 11:55:25 +01:00
Karl Hobley
e1754ebfa1 Rerun makemessages on wagtailsearch 2014-07-11 11:54:35 +01:00
Karl Hobley
acfcbe9aa3 Rerun makemessages on wagtailimages 2014-07-11 11:54:01 +01:00
Karl Hobley
6c3d1275cb Rerun makemessages on wagtailusers 2014-07-11 11:53:13 +01:00
Karl Hobley
8302cf2866 Rerun makemessages on wagtailredirects 2014-07-11 11:47:50 +01:00