mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
5 314 Commity
54 Gałęzie
255 Tagi
478 MiB
Wykres commitów

5314 Commity (cd168a2b410f60698e8a7f4a2c0fe9187506cc43)

Autor SHA1 Wiadomość Data
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
Matt Westcott 9e28bee22b Set HTTP_HOST in dummy_request for preview - fixes #1703 2015-10-06 11:02:45 +01:00
Karl Hobley 403d76fdfd Merge pull request #1668 from gasman/fix/chooser-not-hiddenfields 
Chooser widgets should appear in the visible_fields list, not hidden_fields
 2015-10-06 10:58:51 +01:00
Tim Heap 5c3908968c Raise ValueError from `resolve_model_string` for unknown types 
A `LookupError` is raised by `apps.get_model()` for an unknown model,
but this `LookupError` was also being raised when values with unhandled
types were passed in. This should be a `ValueError` instead. The
docstring has been amended to document the errors raised.
 2015-10-06 13:34:18 +11:00
Matt Westcott ed8399caee Merge branch 'davecranwell-longrunning-forms' 2015-10-05 22:55:18 +01:00
Matt Westcott cf9758138a Release note for #1075 2015-10-05 22:54:37 +01:00
Matt Westcott 498db70e5d Merge branch 'longrunning-forms' of https://github.com/davecranwell/wagtail into davecranwell-longrunning-forms 
Conflicts:
	wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss
 2015-10-05 22:48:27 +01:00
Matt Westcott 3cbee6c66c fix typo I introduced while removing typos 2015-10-05 21:12:21 +01:00
Matt Westcott 7d67e4b448 Minor copyediting on the Pages docs 2015-10-05 21:07:09 +01:00
Karl Hobley be0a2ccd1c Tweaks to template rendering docs 2015-10-05 21:07:09 +01:00
Karl Hobley f72e84f199 Added a couple of missing links 2015-10-05 21:07:09 +01:00
Karl Hobley c18c67ba3b Working with pages docs 2015-10-05 21:07:09 +01:00
Karl Hobley 2e65c08210 Docs for inline models 2015-10-05 21:07:09 +01:00
Karl Hobley ee7718ccdb Various tweaks 2015-10-05 21:07:09 +01:00
Karl Hobley 249a411b09 Template rendering docs 2015-10-05 21:07:09 +01:00
Karl Hobley 1b282d49bc Work on "Page models" 2015-10-05 21:07:09 +01:00
Karl Hobley 86c01bdf7b Renamed to "Page models" 
I think this is a good place to add some general usage docs so made the name more generic.
 2015-10-05 21:07:09 +01:00
Karl Hobley e1bb391625 editing_api => panels 2015-10-05 21:07:08 +01:00
Karl Hobley 85414a8b54 Fixed headings 2015-10-05 21:07:08 +01:00
Karl Hobley f72b8302f9 Moved "setting up the page editor interface" into topics 2015-10-05 21:07:08 +01:00
Karl Hobley 1345d5d24f Allow "_" GET parameter in the API. Fixes #1671 
Used by jQuery for cache-busting
 2015-10-05 20:46:41 +01:00