Matt Westcott
07e37af3eb
Assert that an error message is present
2015-09-04 14:48:51 +01:00
Matt Westcott
2d90d0dbf2
Merge branch 'quick-fix-1665' of https://github.com/kaedroho/wagtail into kaedroho-quick-fix-1665
2015-09-04 14:36:08 +01:00
Matt Westcott
d113390ab4
failing test for #1665
2015-09-04 14:35:43 +01:00
Matt Westcott
dc655192fe
Release notes for new translations
2015-09-04 14:21:55 +01:00
Karl Hobley
04dcc6984c
Add error_messages attribute to UserCreationForm
...
Fixes #1665
2015-09-04 14:19:11 +01:00
Matt Westcott
d64111f689
Pull new translations from Transifex
2015-09-04 13:54:06 +01:00
Matt Westcott
335d3650cf
Merge branch 'takeflight-refactor/is_abstract'
2015-09-04 12:42:46 +01:00
Matt Westcott
c17c7b1b87
Release note and upgrade consideration for #1631
2015-09-04 12:42:36 +01:00
Matt Westcott
c3beacacf0
Test that the deprecated is_abstract=True flag is equivalent to is_creatable=False
2015-09-04 12:19:50 +01:00
Tim Heap
e87cecdcaf
Add deprecated is_abstract support for backwards compatibility
...
It raises a RemovedInWagtail13Warning when used, and is only checked if
`is_creatable` is not present.
2015-09-04 10:01:14 +10:00
Tim Heap
5df60caef3
Rename is_abstract to is_creatable
...
`is_creatable` better reflects what it is used for, and stops any
confusion between Wagtail's `is_abstract` and Django's `Meta.abstract`.
`is_creatable` takes in to account `Meta.abstract` now, so developers
will no longer need to set both `is_abstract` and `Meta.abstract`.
Documentation for the new attribute has been added, as well as tests.
2015-09-04 09:59:01 +10:00
Matt Westcott
ca81f1cc99
Merge branch 'davecranwell-streamfield-tab-design'
2015-09-03 17:05:15 +01:00
Matt Westcott
87e4864729
Release note for #1445
2015-09-03 17:05:03 +01:00
Matt Westcott
80e919907b
Merge branch 'streamfield-tab-design' of https://github.com/davecranwell/wagtail into davecranwell-streamfield-tab-design
2015-09-03 17:00:35 +01:00
Matt Westcott
e2ecac51b9
Merge branch 'kaedroho-redirects-fixes'
2015-09-03 16:30:26 +01:00
Matt Westcott
e5a5761d5a
Release note for #1475
2015-09-03 16:30:18 +01:00
Matt Westcott
a603961134
Merge branch 'redirects-fixes' of https://github.com/kaedroho/wagtail into kaedroho-redirects-fixes
2015-09-03 16:22:45 +01:00
Matt Westcott
5fa6371fa1
Release note for #1660
2015-09-03 15:30:36 +01:00
Matt Westcott
fb559c0cea
Merge branch 'kaedroho-fix-1418'
2015-09-03 15:20:35 +01:00
Matt Westcott
6422eb197c
Merge branch 'fix-1418' of https://github.com/kaedroho/wagtail into kaedroho-fix-1418
2015-09-03 15:08:00 +01:00
Matt Westcott
be869e54c6
Merge pull request #1663 from gasman/takeflight-bug/tagged-snippets
...
Add tests for and update documentation for tagged snippets (update of #1624 )
2015-09-03 13:01:23 +01:00
Matt Westcott
e2e933a785
test that tags on saved snippets are not an empty list
2015-09-03 12:38:46 +01:00
Matt Westcott
cb0b9b7f0e
Renumber test migration
2015-09-03 12:31:45 +01:00
Matt Westcott
e60e57016e
Merge branch 'bug/tagged-snippets' of https://github.com/takeflight/wagtail into takeflight-bug/tagged-snippets
...
Conflicts:
docs/topics/snippets.rst
2015-09-03 12:18:25 +01:00
Karl Hobley
da96a6758e
Changelog for #1589
2015-09-03 12:16:35 +01:00
Karl Hobley
f365028f1b
Merge pull request #1601 from gasman/fix/page-permissions-action-buttons
...
Remove spurious action buttons from page permissions interface - fixes #1589
2015-09-03 12:12:13 +01:00
Matt Westcott
3d1f83755b
Release note for #1612
2015-09-03 12:06:29 +01:00
Matt Westcott
d85b0041dc
Merge branch 'master' of https://github.com/torchbox/wagtail
2015-09-03 12:00:47 +01:00
Matt Westcott
5db2f36928
Merge branch 'feature/explorer-root-help'
2015-09-03 12:00:25 +01:00
Matt Westcott
71923a428a
Only show signposting messages when a parent page exists.
...
This prevents them from appearing on other views that piggyback on list_explore and really shouldn't: search results and page usage.
2015-09-03 11:44:28 +01:00
Matt Westcott
e1cadf7ef3
Add tests for explorer signposting messages
2015-09-03 11:42:35 +01:00
Matt Westcott
af93c04ef2
Updated signposting text as per https://github.com/torchbox/wagtail/pull/1612#issuecomment-136734938
2015-09-03 11:07:07 +01:00
Matt Westcott
1bd9753e8f
Add help messages to steer editors away from creating pages at the root level
2015-09-03 10:41:12 +01:00
Karl Hobley
d317a91e05
Merge pull request #1662 from kaedroho/fix-get_search_promotions
...
Fix crash in get_search_promotions templatetag
2015-09-03 10:41:09 +01:00
Matt Westcott
1aa0f0b9ef
Always add an 'ordering' column to the explorer regardless of permission - fixes #1608
2015-09-03 10:40:27 +01:00
Matt Westcott
1f5dc4c024
Release note for #1571
2015-09-03 10:38:13 +01:00
Matt Westcott
105205d593
Merge branch 'takeflight-refactor/jinja-support'
2015-09-03 10:32:50 +01:00
Matt Westcott
5556206d31
Merge branch 'refactor/jinja-support' of https://github.com/takeflight/wagtail into takeflight-refactor/jinja-support
2015-09-03 10:24:00 +01:00
Karl Hobley
e01cada04f
Fix crash in get_search_promotions templatetag
2015-09-03 10:17:36 +01:00
Karl Hobley
e1abccd829
Failing test for get_search_promotions tag crash
2015-09-03 10:15:19 +01:00
Karl Hobley
f615010524
Added Eirik Krogstad to contributors
2015-09-03 09:36:43 +01:00
Tim Heap
5c95959685
Use alternate context var for Jinja support
...
Jinja does not support using `self` as a template variable, as `self` is
reserved for its own internal use. To add support for Jinja templates,
an alternative name has been added where 'self' has been used. Template
authors are free to use which ever template variable works in their
template language.
2015-09-03 13:50:55 +10:00
Karl Hobley
cf965a86fe
Update wagtailcore translation sources
2015-09-02 20:11:44 +01:00
Matt Westcott
b42f3d4776
Merge branch 'kaedroho-core-verbose-names-cleanup'
2015-09-02 19:51:14 +01:00
Matt Westcott
d182fcc729
Merge branch 'core-verbose-names-cleanup' of https://github.com/kaedroho/wagtail into kaedroho-core-verbose-names-cleanup
2015-09-02 19:32:38 +01:00
Karl Hobley
2d1862ac8a
Fix edit handlers test
2015-09-02 17:05:38 +01:00
Karl Hobley
dd4db13180
Remap primary keys of child objects in revisions when copying page
2015-09-02 16:51:55 +01:00
Karl Hobley
e040008f9f
Failing test for #1418
2015-09-02 16:49:26 +01:00
Matt Westcott
af83547c27
Merge branch 'kaedroho-pr/1429'
2015-09-02 16:34:41 +01:00
Matt Westcott
cfaed7faba
Release note for #1541
2015-09-02 16:34:27 +01:00
