diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c8b078992..5122b8d1d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ Changelog 0.6 (xx.xx.20xx) ~~~~~~~~~~~~~~~~ + * Added Django 1.7 support * Added {% routablepageurl %} template tag (@timheap) * Added RoutablePageMixin (@timheap) * Renamed wagtailsearch.indexed to wagtailsearch.index diff --git a/README.rst b/README.rst index 88106719b..a2c11cb16 100644 --- a/README.rst +++ b/README.rst @@ -45,9 +45,7 @@ Available at `wagtail.readthedocs.org `_ and al Compatibility ~~~~~~~~~~~~~ -Wagtail supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. - -Django 1.7 support is in progress pending further release candidate testing. +Wagtail supports Django 1.6.2+ and 1.7rc3+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Wagtail's dependencies are summarised at `requirements.io `_. diff --git a/docs/index.rst b/docs/index.rst index 0ce7b02fa..55575fbff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ Welcome to Wagtail's documentation Wagtail is a modern, flexible CMS, built on Django. -It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing. +It supports Django 1.6.2+ and 1.7rc3+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. .. toctree:: :maxdepth: 3 diff --git a/docs/releases/0.6.rst b/docs/releases/0.6.rst index 2b86b58e8..a5fbad591 100644 --- a/docs/releases/0.6.rst +++ b/docs/releases/0.6.rst @@ -10,6 +10,12 @@ Wagtail 0.6 release notes - IN DEVELOPMENT What's new ========== +Django 1.7 support +~~~~~~~~~~~~~~~~~~ + +Wagtail can now be used with Django 1.7. + + Minor features ~~~~~~~~~~~~~~ * A new template tag has been added for reversing URLs inside routable pages. See :ref:`routablepageurl_template_tag`.