Matt Westcott
98e9b24ca0
Remove useless empty page-editor.js from wagtailforms
2015-10-09 20:12:21 +01:00
Matt Westcott
8e00899233
Merge branch 'kaedroho-fill-operation-fixes'
2015-10-09 17:17:08 +01:00
Matt Westcott
5aa5ffc7c0
Merge branch 'fill-operation-fixes' of https://github.com/kaedroho/wagtail into kaedroho-fill-operation-fixes
...
Conflicts:
wagtail/wagtailimages/image_operations.py
2015-10-09 17:05:45 +01:00
Matt Westcott
337277ad92
Merge branch 'kaedroho-inline-panel-min-max'
2015-10-09 16:41:48 +01:00
Matt Westcott
6612f0adf3
Release note for #1529
2015-10-09 16:41:32 +01:00
Matt Westcott
3b78e923a0
Disable add button on InlinePanel when max_num reached
...
As suggested by @salvadormf in https://github.com/torchbox/wagtail/pull/1529#issuecomment-127644330
2015-10-09 16:32:44 +01:00
Matt Westcott
bce8bf1a5c
Bump django-modelcluster version to 1.0
2015-10-09 15:47:49 +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
Matt Westcott
51ed38e6e1
Fix Advert test model to inherit from ClusterableModel.
...
django-modelcluster 1.0 includes a system check to ensure that ParentalKey points to a ClusterableModel; Advert falls foul of this.
2015-10-09 15:24:14 +01:00
Karl Hobley
ea436e51cc
Changelog/release note/contributor for #1688
2015-10-09 09:57:33 +01:00
Karl Hobley
80fbdca1a2
Merge pull request #1688 from maxxst/master
...
updated settings so that there is no decrepation warning
2015-10-09 09:54:27 +01:00
Karl Hobley
eb27195e8f
Fixed typo in Jinja2 docs
2015-10-08 16:59:58 +01:00
Matt Westcott
88f385e0de
Add Tim Heap to authors
2015-10-08 15:48:58 +01:00
Karl Hobley
15e06c3120
Merge pull request #1794 from takeflight/tests/expectedFailure-document
...
Fix expectedFailures for Documents
2015-10-08 09:40:24 +01:00
Karl Hobley
73cc896a4f
Fix syntax error (oops)
2015-10-08 09:37:21 +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
Karl Hobley
ce16e2cf08
Removed unneeded check
2015-10-08 09:32:18 +01:00
Tim Heap
f7b6f805ec
Document filenames in the URL should not be checked
...
Wagtail should be forgiving with filenames at the end of the URL. These
filenames are to make the URL look nice, and to provide a fallback for
browsers that do not handle the 'Content-Disposition' header filename
component. They should not be validated.
2015-10-08 10:04:46 +11:00
Tim Heap
1d4b79f6aa
Check for the correct filename in document headers
2015-10-08 10:04:46 +11:00
Matt Westcott
a596fd82f1
Merge pull request #1802 from gasman/pagination-helper-redo
...
Refactor pagination into a helper - rebuild of #1496
2015-10-07 23:24:24 +01:00
Tim Heap
045e72f2dd
Update styleguide to use {% paginate %}
2015-10-07 22:21:56 +01:00
Tim Heap
9c01930d93
Add {% pagination %} template tag
...
It complements the `wagtail.utils.pagination.paginate` function. Views
and templates now do not need to know anything about pagination.
This supersedes pagination in templates that was done with
`{% include "wagtailadmin/pages/listing/_pagination.html" %}`.
A few instances of
`{% include "wagtailadmin/shared/pagination_nav.html }` have also been
converted, but I am not familiar enough with the Wagtail admin template
layout and view structure to convert all uses of this.
Conflicts:
wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html
wagtail/wagtailadmin/templates/wagtailadmin/pages/usage_results.html
wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
wagtail/wagtailadmin/views/chooser.py
2015-10-07 22:21:56 +01:00
Tim Heap
7bdd71fa2d
Refactor pagination into a helper
...
Pagination is done almost exactly the same across all of Wagtail. Moving
the repeated code in to one spot ensures mistakes are not made, and
means that pagination is always done consistently.
There are some locations where the pagination helper has not been used,
as there is no request available or something similar. These instances
are special enough that refactoring them does not make sense at this
point.
Conflicts:
wagtail/wagtailadmin/views/chooser.py
wagtail/wagtailadmin/views/pages.py
wagtail/wagtaildocs/views/chooser.py
wagtail/wagtaildocs/views/documents.py
wagtail/wagtailforms/views.py
wagtail/wagtailimages/views/chooser.py
wagtail/wagtailimages/views/images.py
wagtail/wagtailredirects/views.py
wagtail/wagtailsearch/views/editorspicks.py
wagtail/wagtailsnippets/views/chooser.py
wagtail/wagtailsnippets/views/snippets.py
wagtail/wagtailusers/views/groups.py
wagtail/wagtailusers/views/users.py
2015-10-07 22:21:55 +01:00
Matt Westcott
450c4b4ad1
Merge branch 'kaedroho-use-queryset-based-search-api'
2015-10-07 20:02:42 +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
Matt Westcott
6a8bf9793b
Fix test name
2015-10-07 20:02:12 +01:00
Matt Westcott
2c898bf536
Features deprecated in 1.2 should use RemovedInWagtail14Warning
2015-10-07 20:02:02 +01:00
Matt Westcott
39b231ab52
Merge branch 'use-queryset-based-search-api' of https://github.com/kaedroho/wagtail into kaedroho-use-queryset-based-search-api
2015-10-07 20:01:41 +01:00
Anurag Sharma
5915ec1f0e
Changed EMBEDLY_KEY to WAGTAILEMBEDS_EMBEDY_KEY
2015-10-07 20:44:15 +05:30
Karl Hobley
1aac0d6f44
Merge pull request #1797 from takeflight/remove-deprecated-things
...
Remove features scheduled for removal in Wagtail 1.2
2015-10-07 14:10:39 +01:00
Tim Heap
9197bf1259
Remove features scheduled for removal in Wagtail 1.2
...
The RemovedInWagtail12Warning has been removed, and a
RemovedInWagtail14Warning has been added.
2015-10-07 13:42:27 +11:00
Karl Hobley
a8e6bf95e5
Merge pull request #1795 from takeflight/tests/expectedFailure-resolve_model_string
...
Raise ValueError from `resolve_model_string` for unknown types
2015-10-06 22:24:13 +01:00
Karl Hobley
5caa1f0f1f
Release note for #1755
2015-10-06 22:21:25 +01:00
Karl Hobley
4dc09dfb22
Merge pull request #1755 from takeflight/feature/jinja2-template-functions
...
Add rudimentary Jinja2 template tag support
2015-10-06 22:00:47 +01:00
Karl Hobley
23279ad4c6
Improve and deprecate TagSearchable.search()
2015-10-06 19:09:45 +01:00
Karl Hobley
c0ac20109f
Use new QuerySet based search API in document chooser
...
And cleanup pagination
2015-10-06 19:09:45 +01:00
Karl Hobley
cb29c6fceb
Use new QuerySet based search API in document index
2015-10-06 19:09:45 +01:00
Karl Hobley
9d0c19d50f
Added DocumentQuerySet with search method
2015-10-06 19:09:45 +01:00
Karl Hobley
7a1a1d19e1
Use new QuerySet based search API in image index
2015-10-06 19:09:45 +01:00
Karl Hobley
54e6b8d7e3
Use new QuerySet based search API in image chooser
...
And cleanup pagination
2015-10-06 19:09:39 +01:00
Karl Hobley
41aa83a157
Added ImageQuerySet with search method
2015-10-06 19:06:13 +01:00
Karl Hobley
e35ac391d5
Fix typo in PageQuerySet.search
2015-10-06 19:06:13 +01:00
Karl Hobley
49ec886815
Removed prefetch_tags hack. Fixes #1
...
As of taggit 0.11.0 self.tags.all() no longer performs an extra query if the tags were prefetched.
See: https://github.com/alex/django-taggit/pull/140/files#diff-61d51a325171d97c8a56e59ea525339bR351
2015-10-06 19:06:13 +01:00
Karl Hobley
2b5e03a2ac
Deprecate Page.search()
2015-10-06 19:06:13 +01:00
Karl Hobley
ae249f8454
Use QuerySet based search API for admin page search
2015-10-06 19:06:13 +01:00
Matt Westcott
11a1438950
Add 'block.super' to snippets/type_index.html
2015-10-06 16:46:10 +01:00
Matt Westcott
f502e31dd7
Merge branch 'master' of https://github.com/m-sanders/wagtail into m-sanders-master
...
Conflicts:
wagtail/wagtailusers/templates/wagtailusers/groups/create.html
wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
2015-10-06 16:41:00 +01:00
Karl Hobley
490ecff007
Changelog for #1709
2015-10-06 11:06:44 +01:00
