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
Matt Westcott
9215aa4052
Remove old get_context test
2015-09-02 16:29:48 +01:00
Matt Westcott
16b8173b80
Test for #1429
...
Conflicts:
wagtail/wagtailforms/tests.py
2015-09-02 16:22:07 +01:00
Karl Hobley
3cd348206f
Call get_context from AbstractForm.serve(). Fixes #1429
2015-09-02 16:22:06 +01:00
Karl Hobley
9af51be873
Failing test for #1429
2015-09-02 16:22:06 +01:00
Karl Hobley
160e7e1f83
Some cleanup to verbose names of core models
...
- Added verbose name to Page
- All models now have verbose_name_plural
- Made all verbose names lowercase
2015-09-02 16:17:19 +01:00
Karl Hobley
3062835918
Changelog for #1544
2015-09-02 14:54:58 +01:00
Karl Hobley
d76fbc2975
Merge branch 'bug-fix/1543'
2015-09-02 14:51:52 +01:00
Karl Hobley
7f72d038ff
Added merge migration
2015-09-02 14:17:40 +01:00
Karl Hobley
f9df08a0c8
Fix numchild of events index in test fixture
2015-09-02 13:57:32 +01:00
Karl Hobley
ae691f7ed0
Use Django 1.8 meta API in Page.copy()
...
Fall back to old API for Django 1.7
2015-09-02 13:57:32 +01:00
jordij
e8510af03a
Tests updated
2015-09-02 13:57:32 +01:00
jordij
b10fd60f1b
Function docstring to comment
2015-09-02 13:57:31 +01:00
jordij
9746c98f6b
proper comparison to see if a field is a parent link
2015-09-02 13:57:31 +01:00
jordij
ae30cea928
Page copy uses new fresh instance instead of copied one.
2015-09-02 13:57:31 +01:00
Karl Hobley
69c603a19c
Merge pull request #1656 from kaedroho/safe-false-tags-autocomplete
...
Add safe=False to tags autocomplete view. Add tests
2015-09-02 10:20:35 +01:00
