Commit graph

2631 commits

Author SHA1 Message Date
Karl Hobley
efeba8d038 Merge pull request #218 from kaedroho/python-classifiers
Added python 2.6 classifier to setup.py
2014-04-30 09:59:03 +01:00
Karl Hobley
da01556c23 Added python 2.6 classifier to setup.py 2014-04-30 09:58:03 +01:00
Matt Westcott
e511d3e040 pagination_nav should not expect a linkurl parameter when is_ajax flag is set 2014-04-29 15:38:36 +01:00
Matt Westcott
5d328fddc5 Add file_extension property to wagtaildocs.Document 2014-04-29 12:42:16 +01:00
Matt Westcott
5293a6942f Have wagtailforms register its urls / menu item via hooks, so that wagtailadmin doesn't fail if wagtailforms is absent from INSTALLED_APPS 2014-04-29 12:10:16 +01:00
Matt Westcott
71e45dee23 Merge branch 'master' into form-builder
Conflicts:
	wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
2014-04-28 17:33:06 +01:00
Matt Westcott
3dfc58c783 fix logic for fetching the default page mode - should return the internal name, not the tuple 2014-04-28 17:01:08 +01:00
Matt Westcott
d5bef23d5b Merge branch 'master' into feature/pagemodes
Conflicts:
	wagtail/wagtailcore/models.py
2014-04-28 15:40:04 +01:00
Matt Westcott
79334134b7 Update wagtaildocs, wagtailimages, wagtailsnippets and wagtailusers to register their menu items via the construct_main_menu hook rather than hard-coding them in wagtailadmin_tags 2014-04-28 15:15:34 +01:00
Matt Westcott
f1a1aec860 Merge branch 'master' into form-builder 2014-04-28 15:01:00 +01:00
Chris Rogers
7160f85ab9 Update debian.sh 2014-04-28 13:30:37 +01:00
Neal Todd
5c3992686a Supported Django/Python versions note. 2014-04-28 09:50:05 +01:00
Neal Todd
860c3e036f Supported Django/Python versions note. 2014-04-28 09:49:23 +01:00
Matt Westcott
797418f549 Add a register_admin_urls hook so that subapps of wagtailadmin can register their urlpatterns with wagtailadmin, avoiding the need for them to be defined in the project's urlconf 2014-04-25 17:23:58 +01:00
Matt Westcott
c6cc149627 Eliminate 'patterns' from wagtailusers/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:59:37 +01:00
Matt Westcott
8cb983eb22 Eliminate 'patterns' from wagtailsnippets/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:50:56 +01:00
Matt Westcott
cfd0234094 Eliminate 'patterns' from wagtailsearch/urls as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:49:22 +01:00
Matt Westcott
a29f548297 Eliminate 'patterns' from wagtailredirects/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:45:27 +01:00
Matt Westcott
4f5da480dd Eliminate 'patterns' from wagtailimages/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:43:06 +01:00
Matt Westcott
44c217f0a5 Eliminate 'patterns' from wagtailembeds/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:41:21 +01:00
Matt Westcott
e271881156 Eliminate 'patterns' from wagtaildocs/urls.py and admin_urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:37:33 +01:00
Matt Westcott
cea72bcc34 Eliminate 'patterns' from wagtailcore/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:35:19 +01:00
Matt Westcott
12c6e19ca0 Eliminate 'patterns' from wagtailadmin/urls.py as per https://code.djangoproject.com/ticket/22218 2014-04-25 16:33:29 +01:00
Matt Westcott
a7237eb701 Merge branch 'form-builder' of https://github.com/spapas/wagtail into form-builder
Conflicts:
	setup.py
2014-04-25 15:22:44 +01:00
Matt Westcott
dd0c3aae92 add changelog note re Python 2.6 compatibility 2014-04-25 14:53:48 +01:00
Matt Westcott
03660c6b29 Merge pull request #206 from kaedroho/doc-serve-signal
Added document_served signal
2014-04-25 14:51:41 +01:00
Matt Westcott
e4366486a3 Merge pull request #208 from gasman/feature/tox
tox test environment and Python 2.6 support
2014-04-25 10:24:37 +01:00
Karl Hobley
b198dfc39b Added changelog entry for document_served signal 2014-04-25 09:41:51 +01:00
Karl Hobley
6604ad1a80 Renamed doc_serve signal to document_served 2014-04-25 09:28:01 +01:00
Matt Westcott
41c5c1c457 Python 2.6 compatibility - fixes #156 2014-04-24 16:41:58 +01:00
Matt Westcott
aa09c442a2 add tox test environment for sqlite, and include elasticsearch 2014-04-24 15:34:59 +01:00
Matt Westcott
ead1c19dc0 Add tox.ini for multi-version testing 2014-04-24 15:19:43 +01:00
Karl Hobley
85db64d9f7 Added doc_serve signal 2014-04-23 13:23:17 +01:00
Serafeim Papastefanos
6bc96665e6 Merge remote-tracking branch 'origin/scheduled-publishing' into scheduled-publishing 2014-04-23 11:58:51 +03:00
Serafeim Papastefanos
65f093061d Use the plain DateTimeInput widget for ...
go_live_datetime and expiry_datetime. This should probably be improved in
order to use a javascript datetime picker.
2014-04-23 11:56:13 +03:00
Serafeim Papastefanos
686a9beaa9 Add tests for scheduled publishing
This does not actually test the management command for scheduled pages.
2014-04-22 20:12:20 +03:00
Karl Hobley
9ba91c7e87 Use Treebeard 2.0 add_child method 2014-04-22 10:09:35 +01:00
Karl Hobley
2c35b863fb Merge branch 'master' into treebeard-update
Conflicts:
	setup.py
2014-04-22 09:59:32 +01:00
Karl Hobley
c7fdbd22db Pin django-taggit to 0.11.2
Django-taggit 0.12.x seems to break wagtail
2014-04-22 09:58:19 +01:00
Karl Hobley
b7e823037f Updated wagtail to use treebeard 2.0 2014-04-22 09:50:18 +01:00
Karl Hobley
606fcdd6a4 Removed patched treebeard from vendor folder 2014-04-22 09:50:01 +01:00
Serafeim Papastefanos
6839a7474a Add management command for scheduled pages
The publish_scheduled_pages management command does three actions:

* Gets live pages which have an expiry_datetime that has passed and set
expired = True and live = False

* Gets all revisions on the moderation queue which have an expiry_datetime
that has passed and remove them from the moderation queue

* Gets all revisions that have an approved_go_live_datetime that has
passed. For each one of them the publish() method of the revision is
called which will perform the required actions for making live this
version of the page.

Finally, a dryrun parameter has been added to the management command. If
this parameter is used then the pages that pass the tests for each of the
above lists will be printed.
2014-04-21 21:48:23 +03:00
Serafeim Papastefanos
792b37d956 Add "expired" status to pages 2014-04-21 18:08:47 +03:00
Serafeim Papastefanos
89f2d76bfd Set expired = False when publishing pages both ...
in views and models and refactor code a bit.
2014-04-21 18:03:57 +03:00
Dave Cranwell
2ebf9ba931 first commit of new styleguide 2014-04-17 17:54:54 +01:00
Dave Cranwell
14913d0d1a added pagination to list of pages using a given content type 2014-04-17 14:03:52 +01:00
Dave Cranwell
99e599d940 Merge pull request #200 from davecranwell/master
removed breadcrumb from move interface
2014-04-16 11:07:11 +01:00
Dave Cranwell
121e1351cb removed breadcrumb from move interface 2014-04-16 11:06:50 +01:00
Serafeim Papastefanos
1ebe234a7e Add go_live_datetime handling on views/models
The logic for publishing a page exists in the create and edit views of
wagtailadmin.views.pages and in the publish methodd of hte PageRevision
model.

When a page is created and published (create view), if it has a go_live
in the future then it will not be live but the revision that will be
created will have the approved_go_live set to the corresponding datetime.
If the page is just saved or submitted for moderation the normal flow
will be followed.

When a page is edited and published (edit view):
* The approved_go_live_datetime will be cleared for all older revisions of
that page.
* If the edit has a go_live in the future then the new revision that will
be crated will have the approved_go_live set to that datetime. Also the
live attribute of the page will be set to False.
If the page is edited and not published the normal flow will be followed.

When a submitted for moderation page is published (publish method):
* If it has a go_live in the future then the live attribute will be set to
False, the approved_go_live_datetime of the revision will be set to the
go_live_datetime of the page and the approved_go_live_datetime of all
other revisions will be cleared.
* If it does not have a go_live in the future then the page will be live
and the approved_go_live_dattime of all other revisions will be cleard

Finally, if a page is unpublished then then approved_go_live_datetime of
all revisions of that page will be cleared.
2014-04-16 11:15:41 +03:00
Serafeim Papastefanos
a40c71687d Show clean model errors on edit also 2014-04-16 11:15:38 +03:00