Commit graph

4888 commits

Author SHA1 Message Date
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
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
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
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
Karl Hobley
26db43e85d Add safe=False to tags autocomplete view. Add tests 2015-09-02 09:40:27 +01:00
Karl Hobley
84a507715e Delete .drone.yml 2015-09-01 12:35:42 +01:00
Matt Westcott
bed5ef7efa Merge branch 'wgiddens-patch-1' 2015-09-01 10:46:01 +01:00
Matt Westcott
1ecca7d409 Merge branch 'patch-1' of https://github.com/wgiddens/wagtail into wgiddens-patch-1 2015-09-01 10:44:55 +01:00
Matt Westcott
999950e9e3 Failing test for #1654 2015-09-01 10:44:32 +01:00
Matt Westcott
b62faf73ba Clarify 'the directory containing wagtaildemo' - fixes #1651 2015-09-01 10:13:16 +01:00
Will Giddens
11c7029e87 fix reverse for image_usage
change _ to :
2015-08-31 17:27:53 -04:00
Matt Westcott
4371368854 Merge pull request #1652 from kaedroho/image-chooser-12-images
Show 12 images in image chooser
2015-08-31 20:45:06 +01:00
Karl Hobley
13a6396c0b Show 12 images in image chooser 2015-08-31 13:01:27 +01:00
Matt Westcott
a160922b9a Merge branch 'kaedroho-issue-1584' 2015-08-28 23:08:06 +01:00
Matt Westcott
1ced5f0d6d Release note for #1633 2015-08-28 23:07:49 +01:00
Matt Westcott
b541cadef3 Ignore any ResourceWarnings that happen while we're testing for the presence of a deprecation warning 2015-08-28 21:20:32 +01:00
Matt Westcott
3e51150f1d Merge branch 'issue-1584' of https://github.com/kaedroho/wagtail into kaedroho-issue-1584 2015-08-28 20:31:18 +01:00
Matt Westcott
c072d94fe2 Don't show the page type of root (cherry-picked from #1482) 2015-08-28 15:33:30 +01:00
Matt Westcott
91959c61ce Add Joss Ingram to contributors 2015-08-28 14:57:12 +01:00
Matt Westcott
c26e3c1910 Merge branch 'kaedroho-issue-1276b' 2015-08-28 14:56:10 +01:00
Matt Westcott
e25464eee9 Release note for #1626 2015-08-28 14:55:54 +01:00
Matt Westcott
14c9d9d34d Merge branch 'issue-1276b' of https://github.com/kaedroho/wagtail into kaedroho-issue-1276b 2015-08-28 14:41:36 +01:00
Matt Westcott
07793aeaee Merge pull request #1625 from kaedroho/show-in-menus-filter-field
Added show_in_menus into Page filter fields
2015-08-28 12:09:38 +01:00
Matt Westcott
ffeb1004e7 Merge branch 'kaedroho-show-deprecation-warnings-for-next-version' 2015-08-28 11:44:32 +01:00
Matt Westcott
6c35fb8d63 Merge branch 'show-deprecation-warnings-for-next-version' of https://github.com/kaedroho/wagtail into kaedroho-show-deprecation-warnings-for-next-version 2015-08-28 11:43:49 +01:00