Karl Hobley
bfa04dfd24
Added assertRegex to WagtailTestUtils
2014-07-04 16:14:42 +01:00
Matt Westcott
2def3b3859
Merge branch 'kaedroho-issue/408'
2014-07-04 11:54:53 +01:00
Matt Westcott
85976d2a58
Merge branch 'issue/408' of https://github.com/kaedroho/wagtail into kaedroho-issue/408
2014-07-04 11:45:43 +01:00
Karl Hobley
56647908d0
Improved test_post_reorder test
2014-07-04 11:39:42 +01:00
Karl Hobley
c7ec5792f6
Make sure all editors picks are resaved on edit. Fixes #408
...
As we are setting the sort_order manually. The formset doesn't think the editors pick has changed so doesn't save it.
This caused a SQLite test to fail as NULL is always greater than any integer causing ordering to be incorrect.
2014-07-04 11:34:13 +01:00
Karl Hobley
fe3c2e6c0b
Added __repr__ to EditorsPicK
2014-07-04 11:33:34 +01:00
Karl Hobley
14228a56e1
Merge pull request #419 from gasman/serve_preview
...
Use serve_preview() rather than serve() for all preview / moderation / view_draft actions
2014-07-03 17:22:22 +01:00
Matt Westcott
c0d2a70d6d
output a DeprecationWarning if get_page_modes has been overridden
2014-07-03 16:46:10 +01:00
Matt Westcott
26cacbc95a
Merge pull request #417 from kaedroho/wagtailcore-cleanup-3
...
Cleanup a few methods of UserPagePermissionsProxy
2014-07-03 16:06:09 +01:00
Matt Westcott
a1bf11113a
update view_draft and preview_for_moderation to call serve_preview (rather than serve, which for some page models might require additional args/kwargs)
2014-07-03 15:51:24 +01:00
Matt Westcott
493fc29c08
Deprecate the show_as_mode method in favour of serve_preview which additionally takes a 'request' argument
2014-07-03 15:31:27 +01:00
Karl Hobley
78abe31b05
Cleanup a few methods of UserPagePermissionsProxy
2014-07-03 15:15:12 +01:00
Matt Westcott
0a38e0b8d3
rename display_modes to preview_modes for consistency
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 15:03:38 +01:00
Matt Westcott
78481dc846
syntactic sugar for get_page_modes: change it to a property called preview_modes and add a default_preview_mode helper
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 15:01:35 +01:00
Matt Westcott
dd52ccab2a
Remove X-Requested-With header hacks on the incoming requests to preview_on_edit and preview_on_create - no longer necessary, because we're not passing that request to the preview logic
...
Conflicts:
wagtail/wagtailadmin/views/pages.py
2014-07-03 14:59:34 +01:00
Karl Hobley
91687d923e
Merge pull request #363 from mope/fix-edit-handlers-test
...
Tidy up unit tests
2014-07-03 14:31:46 +01:00
Tom Talbot
c0cb1b6280
Remove mock expected calls from edit handler tests
...
'Expected calls' works differently in Python 2 and 3
2014-07-03 14:11:29 +01:00
Karl Hobley
148fcf04e3
Merge pull request #414 from kaedroho/frontendcache-purge-url
...
Allow purging individual URLs from frontend cache
2014-07-03 13:59:13 +01:00
Tom Talbot
69077927f9
Fix FieldPanel test failures
2014-07-03 13:56:43 +01:00
Karl Hobley
735cfe3767
Use UTC timezone in tests
...
This prevents Django from converting times in tests
2014-07-03 13:44:11 +01:00
Tom Talbot
521f5924f6
Merge branch 'master' into fix-edit-handlers-test
2014-07-03 13:41:05 +01:00
Karl Hobley
c9385ca1ce
frontend cache purge docs change
2014-07-03 13:10:03 +01:00
Karl Hobley
3dc83a961f
Updated changelog
2014-07-03 13:07:18 +01:00
Karl Hobley
25e9249308
Added a couple of missing python version classifiers
2014-07-03 13:06:32 +01:00
Karl Hobley
00347ff6ba
Rearrange static site generation docs
2014-07-03 12:53:11 +01:00
Matt Westcott
f28e43f02f
Merge branch 'master' of github.com:torchbox/wagtail
2014-07-03 12:36:15 +01:00
Matt Westcott
e509871624
Merge branch 'kaedroho-page-duplication'
2014-07-03 12:35:57 +01:00
Matt Westcott
27e935db68
Merge branch 'page-duplication' of https://github.com/kaedroho/wagtail into kaedroho-page-duplication
...
Conflicts:
wagtail/wagtailcore/tests/test_page_model.py
2014-07-03 12:35:43 +01:00
Neal Todd
2f126bda6e
Update index.rst
2014-07-03 12:26:48 +01:00
Tom Talbot
cd14be23c3
Tweak FieldPanel tests
2014-07-03 12:22:44 +01:00
Matt Westcott
45621aa48e
Merge branch 'kaedroho-python3-take2-unicode-literals'
2014-07-03 12:15:50 +01:00
Matt Westcott
9938ecf960
add py32-dj16-sqlite to the list of tox environments that fail due to iteritems in South
2014-07-03 12:11:34 +01:00
Matt Westcott
d4cfb434d5
Merge branch 'python3-take2-unicode-literals' of https://github.com/kaedroho/wagtail into kaedroho-python3-take2-unicode-literals
2014-07-03 11:51:03 +01:00
Tom Talbot
d7f1e317f0
Merge branch 'master' into fix-edit-handlers-test
...
Conflicts:
wagtail/wagtailembeds/tests.py
2014-07-03 11:44:45 +01:00
Tom Talbot
de3f852e43
Removed EditHandler tests. Added more FieldPanel tests
2014-07-03 11:41:23 +01:00
Dave Cranwell
b0ef94a2db
Update README.rst
2014-07-03 11:06:43 +01:00
Dave Cranwell
3ab75c0cfe
Update README.rst
2014-07-03 11:05:56 +01:00
Karl Hobley
1a3558cabd
Added DeprecationWarning to wagtailadmin.hooks
2014-07-03 10:25:26 +01:00
Karl Hobley
6868d30ded
Merge pull request #411 from gasman/move_hooks_into_wagtailcore
...
Move the hooks subsystem into wagtailcore
2014-07-03 10:23:18 +01:00
Karl Hobley
d71342ce44
Merge pull request #415 from davecranwell/master
...
Addressing issue where ordering of new inlinepanel items created two ite...
2014-07-03 10:19:26 +01:00
Karl Hobley
e4a9756c79
Added little section in the docs describing purge_url_from_cache
2014-07-03 10:14:51 +01:00
Dave Cranwell
09cdc99ff2
Addressing issue where ordering of new inlinepanel items created two items of the same order
2014-07-03 10:14:01 +01:00
Karl Hobley
1ce157ea43
Added purge_url_from cache to wagtailfontendcache.utils
2014-07-03 09:17:55 +01:00
Karl Hobley
6800869153
Ditto for WagtailAdminModelForm class
2014-07-02 22:37:08 +01:00
Karl Hobley
c743b71a03
Cast edit handler type names to str before passing into type()
...
On python 2, these need to be bytestrings and on python 3 they need to be unicode. So casting to str is a good fit.
2014-07-02 22:26:30 +01:00
Karl Hobley
81f427d801
Make sure names of edit handler types are bytestrings and not unicode
2014-07-02 22:15:48 +01:00
Karl Hobley
f758808a21
Added python 3.2 to travis settings
2014-07-02 22:02:07 +01:00
Matt Westcott
b45b1d5404
remove a load of unused imports
2014-07-02 21:56:50 +01:00
Karl Hobley
e42029328f
Added python 3.2 support to readme
2014-07-02 21:46:37 +01:00
Karl Hobley
9755ece5cc
Added python 3.2 to tox settings
2014-07-02 21:45:38 +01:00