Wykres commitów

3966 Commity (f2b4ac9753eef69e28dacc9f130c0cc5a2644738)

Autor SHA1 Wiadomość Data
Dave Cranwell e5771697be corrected page var which should have been page_to_move but didn't throw test errors 2015-04-16 16:47:37 +01:00
Karl Hobley b2013fd580 Fixed undefined name error 2015-04-16 16:11:51 +01:00
Dave Cranwell b779ec4a31 updated a few places where contextual notification buttons were missing 2015-04-16 14:27:55 +01:00
Dave Cranwell 921513cbfd Merge remote-tracking branch 'upstream/master' 2015-04-16 13:56:32 +01:00
Karl Hobley 55a9d91e4b Merge pull request #1193 from georgewhewell/patch-2
Update docs for static site generation
2015-04-16 10:57:51 +01:00
georgewhewell ebf2d767e0 Update docs for static site generation
the staticsitegen command won't work without these settings- will throw NotImplementedErrors using defaults.
2015-04-16 10:56:29 +01:00
Josh Barr 0eb2ca7cf2 added css guidelines 2015-04-16 17:09:13 +12:00
Karl Hobley 54eb98f8d4 Merge pull request #1189 from gasman/cleanup/page-list
Clean up wagtailadmin/pages/list.html
2015-04-15 13:21:37 +01:00
Josh Barr 7afaa71732 fixed formatting of templates 2015-04-16 00:17:15 +12:00
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 ff85146426 move navigation field for choose/explore/move into separate includes 2015-04-14 23:43:09 +01:00
Josh Barr 7d728284e9 removed unused django module from menu.py 2015-04-15 09:40:19 +12:00
Josh Barr 648efe0e18 allow for procedural highlighting of menu items. also highlights parents of submenus 2015-04-15 09:38:51 +12:00
Matt Westcott 455a40e80c move 'explore' table headers into their own include 2015-04-14 19:16:39 +01:00
Matt Westcott 3073940cfb Eliminate _parent_page_title_choose and _parent_page_title_move templates.
They are identical to the page_title_* templates, except for not having a 'locked' indicator (which was presumably an oversight rather than a deliberate decision).
2015-04-14 18:08:14 +01:00
Matt Westcott 81f2f29383 move page title field out of list.html into includes 2015-04-14 18:02:48 +01:00
Matt Westcott 1b1a997a76 refactor title field in page listing to separate out the move/choose/explore cases 2015-04-14 18:02:47 +01:00
Matt Westcott ed99f86f01 Move 'page locked' indicator into an include 2015-04-14 18:02:46 +01:00
Matt Westcott 5b592be1c2 Move 'This page is protected' indicator into an include 2015-04-14 16:51:43 +01:00
Matt Westcott 0072f60c3a Rename 'lock_indicator' and 'privacy_indicator' widgets to 'lock_switch' and 'privacy_switch'
This distinguishes them from the read-only indicators that appear elsewhere, which also use those classnames for styling.
2015-04-14 16:25:13 +01:00
Matt Westcott 658071cb59 move parent page title field out of list.html into includes 2015-04-14 16:15:49 +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