Commit graph

2354 commits

Author SHA1 Message Date
Karl Hobley
2ffc5828ff Merge remote-tracking branch 'torchbox/master' into bad-imports-cleanup
Conflicts:
	wagtail/wagtailembeds/__init__.py
	wagtail/wagtailsearch/__init__.py
2014-09-18 10:40:32 +01:00
Matt Westcott
7c8b1c4adb Merge branch 'master' of github.com:torchbox/wagtail 2014-09-18 09:50:57 +01:00
Matt Westcott
a4cf05f1bc Merge branch 'takeflight-feature/register-snippet-decorator' 2014-09-18 09:49:15 +01:00
Matt Westcott
f11c34e059 release note for #641 2014-09-18 09:49:08 +01:00
Karl Hobley
007b8249e1 Added contributor entry for #639 2014-09-18 09:19:14 +01:00
Karl Hobley
174e9d6de4 Merge pull request #639 from jalourenco/master
wagtail 0.6.0 pt_PT localization
2014-09-18 09:16:11 +01:00
Karl Hobley
60ed50b75b Merge pull request #642 from takeflight/bug/failing-tests-613
Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out
2014-09-18 09:15:05 +01:00
Tim Heap
cb3094a4a7 Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out
The tests attempted to skip themselves when WAGTAILSEARCH_BACKENDS was
not filled out, but the skip code was throwing an error, causing the
test to fail.
2014-09-18 15:46:49 +10:00
Tim Heap
a1d3a32dd6 Make register_snippet usable as a decorator 2014-09-18 15:35:39 +10:00
Jose Lourenco
344df1d414 add 0.6.0 localized files 2014-09-17 17:44:58 +01:00
Jose Lourenco
f414cf2660 Merge pull request #2 from torchbox/master
Update from  torchbox:master on 2014-09-16;
Wagtail 0.6.0
2014-09-17 16:07:10 +01:00
Tom Dyson
22b32d767e Update installation docs
wagtail start command needs pip install requirements.txt in 0.6
2014-09-17 11:17:02 +01:00
Matt Westcott
354e4930f1 use absolute imports to wagtailadmin SCSS files from wagtailimages 2014-09-16 16:38:36 +01:00
Matt Westcott
abf2173e0d Merge branch 'takeflight-feature/parent_page_types' 2014-09-16 15:49:25 +01:00
Matt Westcott
4ed76af781 release note for #491 2014-09-16 15:47:40 +01:00
Dave Cranwell
04c4e380ba Update README.rst 2014-09-16 15:45:22 +01:00
Matt Westcott
fa558b149d Fix ability to pass a class object in subpage_types / parent_page_types 2014-09-16 15:44:42 +01:00
Matt Westcott
b4097dce1d add unit tests for allowed_subpage_types and allowed_parent_page_types 2014-09-16 15:38:28 +01:00
Dave Cranwell
7c69dd2616 Merge pull request #583 from kaedroho/elasticsearch-asciifolding
Enabled ASCIIFolding in Elasticsearch backend
2014-09-16 12:35:13 +01:00
Matt Westcott
4398b64282 remove allowed_parent_pages / allowed_subpages.
allowed_parent_pages was a (broken) relic of the aborted no-tree add-page interface where you selected page type first and then specify where to put it. In that context, allowed_subpages doesn't make sense because the page you're about to add doesn't have subpages...
2014-09-16 11:57:03 +01:00
Matt Westcott
f28f7f92c2 in to -> into 2014-09-16 11:55:40 +01:00
Matt Westcott
c68dcff7bc copyediting on parent_page_types documentation 2014-09-16 11:55:05 +01:00
Matt Westcott
3eaf1076ab Merge branch 'feature/parent_page_types' of https://github.com/takeflight/wagtail into takeflight-feature/parent_page_types 2014-09-16 11:53:12 +01:00
Matt Westcott
6b2b3ca43e release note for #568 2014-09-16 10:20:18 +01:00
Matt Westcott
99761cdcdc Merge pull request #568 from kaedroho/page-copy-revisions
Make Page.copy also copy revisions
2014-09-16 10:18:18 +01:00
Karl Hobley
28b0f29d18 Clear submitted_for_moderation and approved_go_live_at of copied revisions 2014-09-16 09:18:49 +01:00
Karl Hobley
3857576f90 Make Page.copy also copy revisions 2014-09-16 09:05:57 +01:00
Matt Westcott
9f8a5f2379 Remove content_type template filter from the project template - fixes #626 2014-09-15 19:36:07 +01:00
Matt Westcott
27a3fd50d5 Merge branch 'stable/0.6.x' 2014-09-15 18:07:27 +01:00
Matt Westcott
45a20a6f14 Additions to the 'getting started' documentation so that we're not under-selling the demo site as a way to get started 2014-09-15 18:06:09 +01:00
Dave Cranwell
5355824001 Merge remote-tracking branch 'upstream/master' 2014-09-12 14:48:44 +01:00
Dave Cranwell
edf4eeea7b updated jqui css file to remove duff code 2014-09-12 14:48:08 +01:00
Karl Hobley
3ce222b39d Changelog and release notes for manual image cropping 2014-09-12 14:38:03 +01:00
Karl Hobley
653370b1c0 Merge pull request #602 from kaedroho/feature/manual-image-cropping
Manual image cropping
2014-09-12 14:30:27 +01:00
Karl Hobley
47c0c8b323 Merge remote-tracking branch 'torchbox/master' into feature/manual-image-cropping
Conflicts:
	wagtail/wagtailimages/tests.py
2014-09-12 14:06:28 +01:00
Matt Westcott
04f4a84210 Merge branch 'stable/0.6.x' 2014-09-12 10:19:45 +01:00
Matt Westcott
04da84e505 Fix link to getting started docs 2014-09-12 10:19:39 +01:00
Karl Hobley
2f0eca0562 Bump supported 1.7 version to 1.7.0 2014-09-12 10:18:44 +01:00
Matt Westcott
0563431ca4 Merge branch 'master' of github.com:torchbox/wagtail 2014-09-12 10:17:38 +01:00
Matt Westcott
11f1bfcc15 Add changelog entry for #621 (late arrival...) 2014-09-12 10:17:23 +01:00
Karl Hobley
0e1acdc9b5 Bump supported 1.7 version to 1.7.0 2014-09-12 10:16:19 +01:00
Matt Westcott
e40312f358 specify wagtail 0.6 in project template 2014-09-11 17:25:24 +01:00
Matt Westcott
6bef8ea10f Add Russian translation to release notes 2014-09-11 16:53:18 +01:00
Karl Hobley
bc67a97651 Rerun compilemessages 2014-09-11 16:46:05 +01:00
Karl Hobley
8265907fab Pulled translations from transifex 2014-09-11 16:46:05 +01:00
Karl Hobley
ab5d7353c0 Added wagtailforms to transifex config 2014-09-11 16:46:05 +01:00
Matt Westcott
50c6735b5b Merge branch 'master' of github.com:torchbox/wagtail 2014-09-11 16:40:18 +01:00
Matt Westcott
f7692cf9dc prepare for 0.6 release 2014-09-11 16:40:13 +01:00
Karl Hobley
701f26de99 Rerun makemessages 2014-09-11 16:40:06 +01:00
Matt Westcott
229944c118 actually add creating_your_project.rst this time... 2014-09-11 16:18:45 +01:00