Commit graph

2553 commits

Author SHA1 Message Date
Matt Westcott
a4b60715b9 Check that the content type passed to wagtailadmin.pages.create is valid according to subpage_types 2014-06-17 22:27:11 +01:00
Matt Westcott
a713895440 get_page_types no longer required in wagtailadmin.views.pages 2014-06-17 22:14:23 +01:00
Matt Westcott
8f9298f2b4 Changelog / contributors entry for #243 2014-06-17 22:03:11 +01:00
Matt Westcott
86aa13f066 Merge branch 'master' of github.com:torchbox/wagtail 2014-06-17 21:57:41 +01:00
Matt Westcott
9071a8e004 Tweak subpage_types logic so that subpage_types=None (or undefined) means 'no restriction on subpages', freeing up [] to mean 'no subpages allowed' 2014-06-17 21:48:48 +01:00
Matt Westcott
8d3ac405c4 Deprecate get_leaf_page_content_type_ids and get_navigable_page_content_type_ids, as they have incorrect semantics for page subclasses that don't define subpage_types. Replace them with a naive implementation that doesn't require metaclass hacks 2014-06-17 21:27:26 +01:00
Matt Westcott
a2254148e9 Remove subpage_types logic from is_navigable and get_navigation_menu_items. It's now clear that we will never mandate the use of subpage_types, so we can't use its presence or absence as an indicator of whether or not a page is appropriate to be included in navigation menus. 2014-06-17 20:40:55 +01:00
Karl Hobley
015f7c126d Removed assertURLEqual, replaced with Djangos built in assertRedirects 2014-06-17 17:49:52 +01:00
Dave Cranwell
68da7f0c2c corrected commit ref to kaedroho@5dc7a220f8799a7c6871b119724f7e07cb54f4fb 2014-06-17 17:39:48 +01:00
Karl Hobley
9917d777c5 Improvements to existing slug unit tests for create and edit views 2014-06-17 17:38:00 +01:00
Dave Cranwell
553e7062b6 added FieldRowPanel from @kaedroho 5dc7a220f8799a7c6871b119724f7e07cb54f4fb 2014-06-17 17:37:28 +01:00
Karl Hobley
13c341a4d4 Improvements to wagtailadmin explorer tests 2014-06-17 17:26:31 +01:00
Karl Hobley
b480c9e7eb Fixes to wagtailadmin page index view 2014-06-17 17:25:49 +01:00
Dave Cranwell
fb9a876e92 moved set_page_edit_hanlder to edit_handlders.py. Still not happy it's invoked the right way though 2014-06-17 17:20:22 +01:00
Dave Cranwell
b95d6a0fab removed partial work from other branch 2014-06-17 16:58:12 +01:00
Dave Cranwell
9efb6a38d7 styling for scenario where tabs run onto multiple lines 2014-06-17 16:37:22 +01:00
Matt Westcott
f2b5e30de4 Merge pull request #321 from kaedroho/issue-320
Set treebeard attributes in preview on create view. Fixes #320
2014-06-17 16:35:46 +01:00
Dave Cranwell
4788144c86 first bash at customisable tabs like in PR #210 2014-06-17 15:09:10 +01:00
Matt Westcott
5987f2843a remove redundant imports from wagtailcore/models.py 2014-06-17 14:56:44 +01:00
Matt Westcott
f56179f8ba Merge branch 'business-rules' of https://github.com/lojack/wagtail into lojack-business-rules
Conflicts:
	wagtail/tests/models.py
	wagtail/wagtailadmin/tests.py
2014-06-17 14:45:25 +01:00
Dave Cranwell
53cfd94484 Merge remote-tracking branch 'upstream/master' into feature/styleguide 2014-06-17 09:51:11 +01:00
Karl Hobley
7bb37d4efb Cleaned up wagtailembeds/tests.py imports 2014-06-17 09:49:57 +01:00
Dave Cranwell
0f6b6784dc fixing incorrect test import 2014-06-17 09:45:42 +01:00
Karl Hobley
f4245815ba Added sitemap generator 2014-06-17 09:37:35 +01:00
Dave Cranwell
b638cc01e9 Merge branch 'master' into feature/styleguide 2014-06-17 09:36:21 +01:00
Dave Cranwell
7184d6f6d2 font tweaks 2014-06-16 17:28:42 +01:00
Dave Cranwell
2bd1e0076b tweaks to font metrics 2014-06-16 17:10:26 +01:00
Dave Cranwell
506d977950 typo in comment 2014-06-16 15:32:32 +01:00
Karl Hobley
4136bb5053 Added tests for db6bb92 2014-06-16 15:15:38 +01:00
Karl Hobley
db6bb920fb Set treebeard attributes in preview on create view. Fixes #320 2014-06-16 14:57:33 +01:00
Dave Cranwell
7f72bdd917 Merge remote-tracking branch 'upstream/master' into feature/better-modals 2014-06-16 13:19:45 +01:00
Dave Cranwell
bd0a18dc13 tidied image chooser.js 2014-06-16 13:18:27 +01:00
Dave Cranwell
ba15fbead1 added better comments. tweaked when modal is shown 2014-06-16 13:06:02 +01:00
Dave Cranwell
b5dc5a9516 tweaks to make modals fade better 2014-06-16 12:59:43 +01:00
Karl Hobley
5bfa8d6b07 Merge pull request #291 from kaedroho/issue-25
Made login view redirect already logged in users to dashboard.
2014-06-16 12:10:17 +01:00
Karl Hobley
ee222a387b Merge remote-tracking branch 'torchbox/master' into issue-25
Conflicts:
	runtests.py
2014-06-16 10:40:31 +01:00
Karl Hobley
614cd6d028 Merge pull request #281 from kaedroho/tests-changes
Tests changes
2014-06-16 10:38:52 +01:00
Karl Hobley
4235450f5e Minor PEP8 fix 2014-06-16 10:31:05 +01:00
Karl Hobley
02b4223e41 Improvements to page chooser tests 2014-06-16 10:28:59 +01:00
Karl Hobley
1d7cc2b3aa Merge branch 'master' into tests-changes
Conflicts:
	wagtail/wagtailembeds/tests.py
	wagtail/wagtailsnippets/tests.py
2014-06-16 10:23:21 +01:00
Karl Hobley
aef892dc5b Merge pull request #311 from helenwarren/master
Fix behaviour described in issue 77. Specifically validate that for an e...
2014-06-16 10:08:08 +01:00
Karl Hobley
a60af70dfe Docs fix: Elasticutils 0.9+ is not supported 2014-06-16 09:49:01 +01:00
Neal Todd
7a709709e9 Doc fix - use https rather than ssh for wagtaildemo clone 2014-06-16 09:39:06 +01:00
Ben Margolis
ac87fe65be fix a typo and spacing 2014-06-15 22:49:47 -07:00
Ben Margolis
c880ef3b84 Update forms.py 2014-06-15 22:46:27 -07:00
Ben Margolis
138b3ba285 first pass of multi-uploader 2014-06-15 22:35:01 -07:00
Dave Cranwell
dae521aec8 removed redundant script block 2014-06-13 17:21:51 +01:00
Dave Cranwell
16ca198377 Merge remote-tracking branch 'upstream/master' 2014-06-13 17:09:46 +01:00
Dave Cranwell
d6aa265666 all fields now display required asterisk when necessary 2014-06-13 17:08:56 +01:00
Dave Cranwell
72a43567d2 tweaked transition 2014-06-13 16:15:37 +01:00