Matt Westcott
42af5c10af
Merge branch 'merge-settings' of https://github.com/takeflight/wagtail into takeflight-merge-settings
2015-10-23 10:31:27 +01:00
Matt Westcott
94ee586276
Merge branch 'master' of https://github.com/torchbox/wagtail
...
Conflicts:
CHANGELOG.txt
docs/releases/1.2.rst
2015-10-23 10:00:52 +01:00
Matt Westcott
4d4cced717
Release note for #1596
2015-10-23 09:59:41 +01:00
Karl Hobley
ad4007f406
Release note for #1856
2015-10-23 09:57:01 +01:00
Karl Hobley
101726b76e
Fixed capitalisation of REST
2015-10-22 17:32:57 +01:00
Matt Westcott
33e4a7497f
Release note / documentation update for #1790
2015-10-22 17:23:17 +01:00
Tim Heap
c9f73d3157
Fix typo in settings docs
2015-10-21 16:39:09 +11:00
Tim Heap
3d494fb24b
Move wagtailsettings into contrib module
...
The `wagtailsettings` module is useful enough that it should be included
in the Wagtail contrib section, to make it available to all Wagtail
developers.
All the code has been given a once-over to make sure it is nice and
polished before being copied in. As such, this is not a direct copy of
the `wagtailsettings` module. It should be backwards compatible though,
excepting the new location.
It has been moved to `wagtail.contrib.settings`, following the naming
scheme set out in #1504 .
Documentation has been concatenated in to a single page, and added to
the contrib reference section.
2015-10-21 16:39:09 +11:00
Matt Westcott
2eb4b4c2c1
Release notes for #1810 , #1835 , #1812
2015-10-20 11:16:09 +01:00
Matt Westcott
6994f7b7b5
Release note for #1843
2015-10-20 10:37:04 +01:00
Karl Hobley
26889ba128
Merge pull request #1812 from gasman/feature/block-template-context
...
Allow block subclasses to pass extra context variables to templates
2015-10-19 09:29:59 +01:00
Matt Westcott
141129f587
Merge branch 'docs/signals' of https://github.com/JoshBarr/wagtail into JoshBarr-docs/signals
2015-10-16 17:23:04 +01:00
Matt Westcott
bce6fba24f
Release note for #1741
2015-10-16 12:12:07 +01:00
Matt Westcott
749258ebbb
Merge pull request #1828 from jheasly/patch-1
...
Docs fix: Need to flip order of class creation
2015-10-15 11:40:45 +01:00
Matt Westcott
bebc4d4ed3
Remove mention of SASS / django-compressor; fix minor text errors
2015-10-15 09:21:47 +01:00
Matt Westcott
e1b564ee80
Merge branch 'cleanup/project-template-documentation' of https://github.com/timorieber/wagtail into timorieber-cleanup/project-template-documentation
2015-10-15 09:18:42 +01:00
Timo Rieber
f522b146b3
Removed vagrant configuration section
2015-10-15 08:11:16 +02:00
Timo Rieber
8e2c5cfd87
Synced structure to reflect current project template
2015-10-15 08:10:27 +02:00
John Heasly
d87d737f52
Need to flip order of class creation
...
Need to flip order of creating `BlogIndexRelatedLink` and `BlogIndexPage`, otherwise `BlogIndexRelatedLink` references `BlogIndexPage` before it's been created and you get:
```bash
ERRORS:
blog.BlogIndexRelatedLink.page: (fields.E300) Field defines a relation with model 'BlogIndexPage', which is either not installed, or is abstract.
```
2015-10-14 17:29:19 -07:00
Matt Westcott
30d5b62eed
Fix broken link to topics/pages
2015-10-14 17:28:49 +01:00
Matt Westcott
da42620089
Release note for #1791
2015-10-14 17:26:03 +01:00
Matt Westcott
7e7ba37639
Release note for #1770
2015-10-14 17:16:21 +01:00
Matt Westcott
bb8894aa6c
Release note for #1821
2015-10-14 17:07:26 +01:00
Matt Westcott
9b6a389850
Add note about variable names to Jinja2 release notes
2015-10-14 15:25:40 +01:00
Matt Westcott
c1edbe6a98
Merge branch 'docs-self-var' of https://github.com/kaedroho/wagtail into kaedroho-docs-self-var
2015-10-14 14:52:00 +01:00
Karl Hobley
ed1a0f9bb1
Merge pull request #1823 from gasman/fix/page-manager-from-queryset
...
Eliminate duplicated PageQuerySet methods / make `sibling_of` behaviour consistent
2015-10-14 14:35:14 +01:00
Matt Westcott
5bac77a648
Release note for #1822
2015-10-13 22:46:02 +01:00
Matt Westcott
0bb4bac2bc
Release note for #1815
2015-10-13 19:32:29 +01:00
Matt Westcott
dafbdaf20f
Use Manager.from_queryset to construct PageManager, to avoid duplication of queryset methods.
...
This exposes an inconsistency between the old `PageManager.(not_)sibling_of` method (which was
exclusive by default) and `PageQuerySet.(not_)sibling_of)` (which is inclusive). We therefore
standardise on the inclusive behaviour (in line with treebeard's own sibling methods), and note
this change of behaviour in the release notes.
2015-10-13 19:15:12 +01:00
Matt Westcott
c2a183f19f
Documentation tweaks as per https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736415 https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736421
2015-10-13 15:17:47 +01:00
Karl Hobley
b278a0c0f8
Docs for custom ordering
2015-10-13 10:06:58 +01:00
Karl Hobley
4a6f2b5b43
Reworded sentence about using "self" in templates
2015-10-13 09:55:23 +01:00
Karl Hobley
6eae465e64
Renamed "self" template variable to "page" in docs
2015-10-13 09:52:16 +01:00
Matt Westcott
5b029cbfc4
Release note for #1702
2015-10-13 00:19:51 +01:00
Matt Westcott
cb7dc8fd38
Release note for #1696
2015-10-13 00:15:50 +01:00
Matt Westcott
5b8fd66909
Release note for #1682
2015-10-12 22:13:34 +01:00
Matt Westcott
06e721bc74
document the 'operator' kwarg on QuerySet.search
2015-10-12 22:04:29 +01:00
Matt Westcott
46845112e2
Allow block subclasses to pass extra context variables to templates
...
Block now defines a get_context method, which subclasses can override
in the same way as we can for pages.
2015-10-12 13:25:56 +01:00
Karl Hobley
4dbf166e06
Merged duplicate documentation
2015-10-12 12:20:45 +01:00
Karl Hobley
83f8332288
Added docs for search operators
2015-10-12 12:15:57 +01:00
Karl Hobley
fb09d89ec6
Search docs improvements
2015-10-12 12:15:33 +01:00
Matt Westcott
6612f0adf3
Release note for #1529
2015-10-09 16:41:32 +01:00
Matt Westcott
c21800b7b0
Merge branch 'inline-panel-min-max' of https://github.com/kaedroho/wagtail into kaedroho-inline-panel-min-max
...
Conflicts:
wagtail/wagtailadmin/edit_handlers.py
2015-10-09 15:42:54 +01:00
Karl Hobley
ea436e51cc
Changelog/release note/contributor for #1688
2015-10-09 09:57:33 +01:00
Karl Hobley
eb27195e8f
Fixed typo in Jinja2 docs
2015-10-08 16:59:58 +01:00
Karl Hobley
6495bb6736
Merge pull request #1799 from anurag-ks/master
2015-10-08 09:35:48 +01:00
Karl Hobley
8a0f6eab30
Changelog/release note and contributor for #1799
2015-10-08 09:35:21 +01:00
Matt Westcott
94d0d7bda2
Release / upgrade consideration note for #1478
2015-10-07 20:02:25 +01:00
Matt Westcott
94b5975afa
Document the new image/document queryset search method
2015-10-07 20:02:19 +01:00
Anurag Sharma
5915ec1f0e
Changed EMBEDLY_KEY to WAGTAILEMBEDS_EMBEDY_KEY
2015-10-07 20:44:15 +05:30
