Commit graph

3887 commits

Author SHA1 Message Date
Karl Hobley
da5dfd4b26 Merge pull request #1184 from gasman/cleanup/page-chooser-header
Clean up page chooser header
2015-04-15 13:02:49 +01:00
Karl Hobley
344da0ac8d Give images and documents default ordering in API 2015-04-15 09:35:09 +01:00
Matt Westcott
5d7446ece1 remove unused search.html / search.js templates 2015-04-14 15:32:04 +01:00
Matt Westcott
257848d58a Split 'browse' and 'search' views of the page chooser into separate templates
instead of one template full of is_searching switches
2015-04-14 15:32:04 +01:00
Matt Westcott
9a4c823854 simplify SearchForm placeholder logic (placeholder_suffix is not used anywhere) 2015-04-14 13:54:31 +01:00
Matt Westcott
40c089f615 document the variables accepted by shared/header.html 2015-04-14 13:12:05 +01:00
Matt Westcott
bf9feaf51e Guard against page.specific_class returning None.
This can happen if the page model is missing (e.g. because it was created on a different git branch). In this case, we only want it to be choosable if the chooser is for all page types.
2015-04-14 11:35:47 +01:00
Matt Westcott
306276b4d7 Merge branch 'kaedroho-dj18warnings' 2015-04-14 10:59:33 +01:00
Matt Westcott
01094b64ba Merge branch 'dj18warnings' of https://github.com/kaedroho/wagtail into kaedroho-dj18warnings
Conflicts:
	wagtail/utils/compat.py
2015-04-14 10:48:08 +01:00
Karl Hobley
239ee67994 Merge pull request #1178 from kaedroho/search-tests
Search tests improvements
2015-04-14 10:45:29 +01:00
Karl Hobley
2b1eb6560a Search tests improvements 2015-04-14 10:08:21 +01:00
Karl Hobley
f2e4832ca9 Merge pull request #1180 from gasman/dj18
Django 1.8 (the revenge)
2015-04-13 22:46:19 +01:00
Matt Westcott
115ffb2212 Check Django version instead of hasattr 2015-04-13 20:47:05 +01:00
Matt Westcott
470fb33b40 fix URL escaping for Django 1.8 2015-04-13 20:47:04 +01:00
Matt Westcott
f9185485a5 test _auth_user_id as a string value 2015-04-13 20:47:04 +01:00
Matt Westcott
d9accc653c Test the HTML output of test_request_serving rather than the template name
Digging around in the response to determine the template used involved an internal API that was changed in Django 1.8, but in any case we should be testing the actual output, not some invisible parameter of it
2015-04-13 20:47:03 +01:00
Matt Westcott
2abe269b75 Update test_create_link to test against a URL with a trailing slash
This means that our test is no longer implicitly depending on a Django quirk that was removed in 1.8: https://docs.djangoproject.com/en/1.8/releases/1.8/#miscellaneous "URLField.to_python no longer adds a trailing slash to pathless URLs."
2015-04-13 20:47:02 +01:00
Matt Westcott
e32e050b30 Add conditionals to test migrations so that they report as up-to-date on both Dj1.7 and 1.8
This would be a bad idea if we were using these migrations for real (because different versions of Django would have different interpretations about what the 'correct' state of the database is), but it doesn't matter for tests because the database is created/torn down on every invocation.
2015-04-13 20:46:04 +01:00
Karl Hobley
bb61b33783 Update tox pip requirements 2015-04-13 20:44:40 +01:00
Karl Hobley
7a830bbe35 Call super setUpClass
Fixtures are now loaded in setUpClass so we must make sure it gets called
2015-04-13 20:44:35 +01:00
Karl Hobley
3efbb152ca Django 1.8 support for API 2015-04-13 20:44:28 +01:00
Karl Hobley
ee2f5530cf Set pk of page in PageRevision.as_page_object
Otherwise, Django sees it as unsaved and doesn't allow any foreign keys to point to it
2015-04-13 17:28:30 +00:00
Karl Hobley
536c09f81f Don't run flake8 test on travis
Running on drone instead
2015-04-13 11:11:10 +01:00
Karl Hobley
aec309cbdc Update .drone.yml 2015-04-12 18:40:01 +01:00
Karl Hobley
ea2294dc98 Added backwards-compatible render_to_string 2015-04-10 16:57:06 +01:00
Karl Hobley
cbad8d8c6d Removed RequestContext from home views 2015-04-10 16:57:06 +01:00
Karl Hobley
886c597b38 Removed RequestContext from userbar 2015-04-10 16:57:06 +01:00
Karl Hobley
84b3a0757a Removed RequestContext from site summary 2015-04-10 16:57:06 +01:00
Karl Hobley
30e04cfaa8 Removed RequestContext from multiple image upload 2015-04-10 16:57:06 +01:00
Karl Hobley
4ad856d0d8 Fixes to render_modal_workflow
- RequestContext is deprecated
- Fixed  mutable dict as a default parameter
2015-04-10 16:57:05 +01:00
Karl Hobley
87cd93587e Use TEMPLATES setting in tests 2015-04-10 16:57:05 +01:00
Karl Hobley
b9c3bc8382 Fix '==' 2015-04-10 16:57:05 +01:00
Karl Hobley
e12d301331 Cleanup usage of get_field_by_name in api 2015-04-10 16:57:05 +01:00
Karl Hobley
381bd10665 Cleanup usages of get_field_by_name in search 2015-04-10 16:57:05 +01:00
Karl Hobley
6dfa1aad01 Fixed deprecation warning in admin migration 2015-04-10 16:57:05 +01:00
Karl Hobley
a679aa26d3 Change search_garbage_collect into BaseCommand 2015-04-10 16:57:05 +01:00
Karl Hobley
ad97bd5b14 Make password reset url configs use callables 2015-04-10 16:57:05 +01:00
Karl Hobley
97d2c06a7e Removed patterns() from project template 2015-04-10 16:57:05 +01:00
Karl Hobley
4ed3646d74 Removed patterns() from tests 2015-04-10 16:57:05 +01:00
Karl Hobley
53659b35b9 Removed patterns() from docs 2015-04-10 16:57:05 +01:00
Karl Hobley
bd292add61 Removed patterns() in wagtailforms 2015-04-10 16:57:05 +01:00
Karl Hobley
1ba88cf7d0 Check Django version instead of hasattr 2015-04-10 16:56:07 +01:00
Matt Westcott
92bb4f980b Merge branch 'master' of github.com:torchbox/wagtail 2015-04-10 15:37:47 +01:00
Karl Hobley
4b5341fd79 Implemented get_related_model in utils.compat 2015-04-10 14:49:13 +01:00
Karl Hobley
012209cc24 Django 1.8 support in edit handlers 2015-04-10 14:49:04 +01:00
Karl Hobley
4f2affcb60 Update get_object_usage to work on Django 1.8 2015-04-10 14:48:51 +01:00
Karl Hobley
11a95a4948 Add args attribute to move_pages and replace_text
Django no longer implicity accepts positional arguments without args being set.
See: https://docs.djangoproject.com/en/dev/releases/1.8/#management-commands-that-only-accept-positional-arguments
2015-04-10 14:33:37 +01:00
Karl Hobley
944017d2c0 Don't set ContentType.name on Django 1.8+
This is now a property rather than a field
2015-04-10 14:08:48 +01:00
Matt Westcott
464dbc9ae2 bump/un-pin versions of modelcluster and taggit 2015-04-10 14:01:09 +01:00
Karl Hobley
b6b685a1e1 Test flake8 on drone 2015-04-10 09:47:11 +01:00