Commit graph

2109 commits

Author SHA1 Message Date
Dave Cranwell
1013cc3f9a merged master, ongoing styling 2014-08-21 17:32:29 +01:00
Dave Cranwell
47f77f3c77 Merge remote-tracking branch 'upstream/master' 2014-08-21 15:57:16 +01:00
Dave Cranwell
6eb5f821ed added quick django example 2014-08-21 15:56:55 +01:00
Dave Cranwell
c0c9c1a7f7 Merge pull request #563 from davecranwell/master
Added more Page model information about previously omitted attributes
2014-08-21 15:30:21 +01:00
Dave Cranwell
628f94519c added more Page model information about previouslly missing attributes like subpage_types 2014-08-21 15:17:14 +01:00
Karl Hobley
c5fef182e5 Fixed a couple of documentation links in the readme 2014-08-21 12:19:57 +01:00
Karl Hobley
8a19552033 Changelog and release notes for #560 2014-08-21 12:19:39 +01:00
Tim Heap
15419f4d0e Make RoutablePage a mixin
If a developer wanted to have a site-wide base page class, and also have
some pages be `RoutablePage`s, a conflict between the automatically
generated `page_ptr` fields would occur.

```python
from wagtail.wagtailcore.models import Page
from wagtail.contrib.wagtailroutablepage.models import RoutablePage

class SitePageBase(Page):
    # common functionality
    is_abstract = True
    class Meta:
        abstract = True

class MyPage(RoutablePage, SitePageBase):
    # This model is invalid
    pass
```

`RoutablePage` has been changed to be a mixin `RoutablePageMixin`. Page
classes can use this to gain the `RoutablePage` functionality while
still retaining the ability to subclass other models.

A `RoutablePage` class that derives from both `RoutablePageMixin` and
`Page` has been left in for backwards compatibility, so old code will
continue to function without any modifications.
2014-08-21 19:42:17 +10:00
pvetch
26314bdfc7 Update using_images_outside_wagtail.rst
Fix to code block syntax
2014-08-19 10:52:49 +01:00
pvetch
470a9e4396 Update routable_page.rst
tiny text fix
2014-08-19 10:51:52 +01:00
Karl Hobley
75e0d32b60 Improved example for 'subpage_urls' in RoutablePage documentation 2014-08-18 11:40:48 +01:00
Karl Hobley
ba6ade482e Changelog and release notes for #538 2014-08-18 09:18:15 +01:00
Karl Hobley
9d59182a94 Merge pull request #538 from takeflight/feature/routable-page-tags
Add `routablepageurl` template tag
2014-08-18 09:06:49 +01:00
Tim Heap
98698ef8d4 Add routablepageurl template tag
It is similar to `pageurl`, but works with `RoutablePage`s. Functions
like a hybrid between `reverse` and `pageurl`. For example:

    {% load wagtailroutablepage_tags %}
    {% routablepageurl self "feed" %}
    {% routablepageurl self "archive" 2014 08 14 %}
    {% routablepageurl self "food" foo="bar" baz="quux" %}
2014-08-18 08:27:07 +10:00
Matt Westcott
f2756ca439 Mention South 1.0 requirement in 0.5 release notes 2014-08-13 16:19:05 +01:00
Matt Westcott
876976fc04 Merge branch 'nathan3d-page_url' 2014-08-12 17:17:39 +01:00
Matt Westcott
a926bf4fe3 changelog entry for #531 2014-08-12 17:17:21 +01:00
Matt Westcott
8f7cb58f0f Add tests for urlconfs that have wagtail_serve at a non-root path 2014-08-12 16:57:08 +01:00
Matt Westcott
07a48abf58 use 'wagtail_serve' as the url name rather than 'wagtail' 2014-08-12 15:36:11 +01:00
Matt Westcott
fe28f5649e Merge branch 'page_url' of https://github.com/nathan3d/wagtail into nathan3d-page_url 2014-08-12 15:26:17 +01:00
Matt Westcott
ce1aecb1d0 Merge branch 'chrxr-master' 2014-08-12 09:03:02 +00:00
Chris Rogers
82a3f8b732 reverted debian.sh 2014-08-11 19:28:25 +01:00
Chris Rogers
e7476cb709 added new screenshots, corrected some typos 2014-08-11 19:23:49 +01:00
Chris Rogers
bf1175523d Merge branch 'master' of https://github.com/torchbox/wagtail 2014-08-11 17:57:04 +01:00
pvetch
ab5ae2049e Update frontend_cache_purging.rst 2014-08-08 09:42:12 +01:00
Nathan Brizendine
5cdb9c8696 Change page url functions to use reverse
Fixes issue #69
2014-08-08 14:30:48 +07:00
Matt Westcott
20e5be9e0e remove redundant Deprecated Features heading from 0.5 release notes 2014-08-01 17:25:49 +01:00
Matt Westcott
8edff405dd prepare for 0.5 release 2014-08-01 17:01:42 +01:00
Matt Westcott
35a4c9a4a1 Merge branch 'master' of github.com:torchbox/wagtail 2014-08-01 16:54:55 +01:00
Matt Westcott
f0e853843f update url to uwsgi-init.d - fixes #522 2014-08-01 16:54:38 +01:00
Karl Hobley
9fea1f2306 Merge pull request #523 from kaedroho/translations
Translations for 0.5
2014-08-01 16:52:21 +01:00
Matt Westcott
13293da5cc remove reference to non-existent redirects documentation 2014-08-01 16:49:17 +01:00
Karl Hobley
bc0f1ce77b Rerun compilemessages 2014-08-01 16:48:19 +01:00
Matt Westcott
381ec5179e Added Copy Page to release notes / changelog 2014-08-01 16:46:27 +01:00
Karl Hobley
8d6ffad7ec Pulled translations from Transifex 2014-08-01 16:45:44 +01:00
Karl Hobley
f14662ae10 Rerun makemessages. Fixes #521 2014-08-01 16:42:18 +01:00
Matt Westcott
2579bc0ef4 Merge pull request #380 from kaedroho/page-copy-ui
Added page copy action to admin
2014-08-01 16:35:45 +01:00
Matt Westcott
455159378f Fix translations and pluralisation within CopyForm 2014-08-01 16:21:25 +01:00
Matt Westcott
a14f604142 Customise the label and help text of the 'publish copies' field when there are no subpages 2014-08-01 16:14:07 +01:00
Matt Westcott
858dd11cc6 Move the 'should we display the publish_copies checkbox' logic into CopyForm 2014-08-01 16:06:51 +01:00
Matt Westcott
37b8f22c4b Submit button on copy page should not say 'yes', because the form is not presented as an 'are you sure?' confirmation message 2014-08-01 15:40:34 +01:00
Matt Westcott
b5f63d13b1 Move the 'should we offer the copy_subpages checkbox or not' logic into CopyForm itself. This also allows us to move the help text into the actual help_text property, which fixes the dodgy spacing on the form field 2014-08-01 15:34:07 +01:00
Matt Westcott
0f8e3cbe57 Validate the slug field in CopyForm against invalid characters 2014-08-01 15:05:47 +01:00
Matt Westcott
e1d1fc917f get CopyForm to set its own initial values so that we don't have to pass them in 2014-08-01 14:59:39 +01:00
Matt Westcott
5bffa72c1a Pass 'page' to the constructor of CopyForm, so that we can define a slug validation method there rather than pushing one in from the view 2014-08-01 14:47:55 +01:00
Matt Westcott
9a86167f6e Hide the 'publish copies' checkbox if there is nothing to publish 2014-08-01 14:19:33 +01:00
Matt Westcott
f55a00fea9 Merge branch 'page-copy-ui' of https://github.com/kaedroho/wagtail into kaedroho-page-copy-ui
Conflicts:
	wagtail/wagtailadmin/tests/test_pages_views.py
2014-08-01 14:12:13 +01:00
Matt Westcott
100797796d make the check_old_style_urlconf not crash and burn if wagtailimages_serve has not been added to urls.py 2014-07-31 15:06:24 +01:00
Karl Hobley
722cc00385 Changelog and release notes for asset usage stats 2014-07-31 12:28:32 +01:00
Karl Hobley
de70f2ab89 Improved implementation of usage_count_enabled
Thanks to @gasman for spotting
2014-07-31 12:19:09 +01:00