Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-14 10:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2631 commits 30 branches 112 tags 89 MiB
Commit graph

2631 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7fc10398dd Minor optimisation when building single field queries 2014-07-04 10:31:50 +01:00
Karl Hobley
dcca9bd515 Use a multi_match query instead of a query_string query 2014-07-04 10:24:32 +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
Karl Hobley
532bb6241e Added some more FilterFields to Page 2014-07-03 14:26:05 +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
7a2e4e76e9 Merge branch 'master' into test-with-custom-user-model 
Conflicts:
	wagtail/tests/models.py
	wagtail/tests/utils.py
	wagtail/wagtailcore/tests/test_page_permissions.py
	wagtail/wagtaildocs/tests.py
 2014-07-03 14:08:07 +01:00
Karl Hobley
5221abeecf Merge branch 'master' into page-copy-ui 
Conflicts:
	wagtail/wagtailadmin/views/pages.py
 2014-07-03 14:04:39 +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
Karl Hobley
b9d3e44ebf Use get_indexed_objects to speed up indexing of Images/Documents 
Previously, this created a query for every single image and document to get the tags. This was very slow on RCA which has over 15000 images.
This commit fixes this by adding a prefetch_related to the QuerySet used for indexing.
 2014-07-03 12:45:31 +01:00
Karl Hobley
9e1bd2d601 Added get_indexed_objects method to Indexed class 
This gives developers control over the QuerySet used when the model is added to the indexed
 2014-07-03 12:45:31 +01:00
Karl Hobley
b78b648682 Implemented __in lookup in ElasticSearch backend 
Also added an error message if a user attempts to use a subquery with the __in lookup.
 2014-07-03 12:45:31 +01:00
Karl Hobley
e35e20dd10 Added search method to PageQuerySet 2014-07-03 12:45:31 +01:00
Karl Hobley
08ced063ff Moved search method into base search backend 2014-07-03 12:45:30 +01:00
Karl Hobley
001fcabb46 Fixed python 3.2 incompatible migration 2014-07-03 12:44:53 +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
Karl Hobley
63e5ca34ce Make sure field filters are sorted before checking them 2014-07-03 12:31:18 +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
Karl Hobley
04c507e37b Added tests for indexed class 2014-07-03 12:05:24 +01:00
Karl Hobley
f02a6937d2 Added more tests for ElasticSearch backend 2014-07-03 12:05:24 +01:00
Karl Hobley
2679dc2fe6 Split up backend tests 2014-07-03 12:04:47 +01:00
Karl Hobley
2100c6372d Moved wagtailsearch test models into wagtail.tests models 2014-07-03 12:04:02 +01:00
Karl Hobley
8a99a63cf1 Fixed typo 2014-07-03 12:01:17 +01:00
Karl Hobley
156eb89850 Changed default values of filters and prefetch_related to None 2014-07-03 12:01:17 +01:00
Karl Hobley
d872768baf Allow query_string to be set to None 
This allows match_all queries to be created
 2014-07-03 12:01:17 +01:00