Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-23 06:15:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7416 commits 30 branches 112 tags 89 MiB
Commit graph

7416 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
5e78be240e Build documentation with Django 1.8 fixes #1451 2015-06-29 09:11:21 +01:00
Matt Westcott
88eb22d160 Merge branch 'kaedroho-search-config-tweak' 2015-06-26 16:38:03 +01:00
Matt Westcott
16c8540771 release note for #1255 2015-06-26 16:37:48 +01:00
Matt Westcott
9bbbe53223 update docs for #1255 2015-06-26 16:34:00 +01:00
Matt Westcott
66e6c58b5b Merge branch 'search-config-tweak' of https://github.com/kaedroho/wagtail into kaedroho-search-config-tweak 
Conflicts:
	docs/search/backends.rst
	wagtail/wagtailsearch/tests/test_backends.py
 2015-06-26 16:33:21 +01:00
Dave Cranwell
9b326631a9 removed cursor:pointer where it was misleading 2015-06-26 14:25:48 +01:00
Dave Cranwell
daf92b0730 altered styling of stream controls to be more like all other buttons. Now grouped with .button-group, which is also documented in styleguide. 2015-06-26 14:15:40 +01:00
Matt Westcott
ad05d74230 Avoid iterating over the page listing when we aren't filtering by type 2015-06-26 12:44:11 +01:00
Matt Westcott
6d416e5bcd Implement pagination on the page chooser 2015-06-26 12:44:11 +01:00
Matt Westcott
54add57ab8 Move page listing pagination links into a common include 2015-06-26 12:20:42 +01:00
Chris Rogers
f28d37675e Merge pull request #1440 from chrxr/master 
Updating editors manual docs for Wagtail 1.0.
 2015-06-26 12:12:31 +01:00
Chris Rogers
bfa6eb4f20 Merge remote-tracking branch 'upstream/master' 2015-06-26 12:01:00 +01:00
Matt Westcott
f3a702a194 Remove the redundant is_searching flag from page search. 
is_searching is true iff a non-empty query_string has been supplied. Since passing a non-empty query_string is the only way to actually get any search results, all {% if is_searching %} blocks within the search results can safely be eliminated.
 2015-06-25 20:00:54 +01:00
Matt Westcott
36c475d524 Fix tests for the new split browse/search views. 
Tests for URLs that pass both a page ID and a query string have been removed, because that never happens in reality (and isn't possible at all in the new URL scheme).
 2015-06-25 19:50:29 +01:00
Matt Westcott
5dc2308a98 Move "page type restricted" warning out of the page-results container 
This means we don't have to duplicate it in the search results output.
 2015-06-25 17:25:29 +01:00
Matt Westcott
d7843f34e3 Split search and browse into separate views 2015-06-25 17:16:30 +01:00
Matt Westcott
ae4d899cbf Move _search_behaviour.js back into browse.js 
Having it as a separate include doesn't accomplish anything other than obfuscate where the 'modal' variable is coming from, and encourage code duplication
 2015-06-25 15:47:26 +01:00
Matt Westcott
4b285a1c8b Remove redundant moving/choosing flags 2015-06-25 13:08:50 +01:00
Matt Westcott
02d6b08249 Remove redundant allow_navigation flag on _list_move.html (it's always true) 2015-06-25 13:04:48 +01:00
Matt Westcott
c51f17cd89 Remove redundant show_parent=True parameter to usage_results.html and search_results.html 
They both ultimately call _list_explore.html with show_parent=1 in all cases
 2015-06-25 12:49:02 +01:00
Matt Westcott
8d55d0581f Move explore-specific elements of the page listing into _list_explore.html 2015-06-25 12:20:16 +01:00
Matt Westcott
dc16e6c42b choose/move listings never have orderable=True 2015-06-25 12:20:16 +01:00
Matt Westcott
548c63d604 Move remaining move/choose conditionals from _list.html into _list_move / _list_choose 2015-06-25 12:20:16 +01:00
Matt Westcott
8f395cc456 Use a common include for the page status tag. 
Behaviour of the tag has also been simplified and made consistent, so that:
* live pages have a tag with 'primary' styling that links to the live page (with target="_blank");
* non-live pages (including scheduled / expired) have greyed-out styling and no link.
 2015-06-25 12:20:16 +01:00
Matt Westcott
2caf88a45c capfirst is redundant in status-tag 
(it's uppercased in CSS, and the other occurrences of status-tag don't do it)
 2015-06-25 12:20:16 +01:00
Matt Westcott
cd3552ef06 'can-disabled' is clearly a typo (see 09097f651e) 2015-06-25 12:20:16 +01:00
Matt Westcott
3734f1250e move custom classnames into list_choose/list_move 2015-06-25 12:20:16 +01:00
Matt Westcott
2e7b6d584a Convert move/choose/explore switches in the table header into template block overrides 2015-06-25 12:20:16 +01:00
Matt Westcott
57a3fa5fe9 Use template inheritance to decouple the choose and move 'modes' of the page listing 
(child templates don't do anything yet, but this provides a hook to hang block overrides off)
 2015-06-25 12:20:15 +01:00
Matt Westcott
f7a8224cd4 move list.html to listing/_list.html to better communicate that it's an include rather than a full page 2015-06-25 12:20:15 +01:00
Matt Westcott
cc276dfe53 release note for #1212 2015-06-25 12:19:22 +01:00
Matt Westcott
fcac6fadad Merge pull request #1212 from MechanisM/patch-2 
Move the styleguide away from the main menu into Settings
 2015-06-25 12:07:10 +01:00
Chris Rogers
315589ef91 Merge remote-tracking branch 'upstream/master' 2015-06-25 12:01:32 +01:00
Chris Rogers
69f930d35d Added snippets section 2015-06-25 12:00:46 +01:00
Matt Westcott
734f7cb67d Merge pull request #1227 from kaedroho/wagtailforms-cleanup 
Some wagtailforms cleanup
 2015-06-25 11:44:15 +01:00
Chris Rogers
251e46c3b6 minor fixes post review 2015-06-25 10:46:15 +01:00
Chris Rogers
6c80a42e45 Merge remote-tracking branch 'upstream/master' 2015-06-24 17:56:32 +01:00
Chris Rogers
0fe719f1d0 Changed lots of things in docs. Just snippets to go 2015-06-24 17:55:42 +01:00
Matt Westcott
90d4f322fd Add 1.1 release notes page to docs + release note for #1434 2015-06-24 10:28:08 +01:00
Matt Westcott
66def3f72d remove IN DEVELOPMENT from 1.0 release notes 2015-06-24 10:24:13 +01:00
Tom Dyson
02e9b5eb99 Merge pull request #1434 from takeflight/bug/image-var-filter 
Allow filters in the {% image %} image variable
 2015-06-24 10:00:42 +01:00
Karl Hobley
369d2d437a Merge pull request #1422 from kaedroho/routablepage-docs-improvements 
Improvements to RoutablePage docs
 2015-06-24 09:52:29 +01:00
Matt Westcott
555a86a121 version-bump deprecation warnings 2015-06-23 16:50:18 +01:00
Matt Westcott
ec763be010 Move the two RemovedInWagtail11Warnings to Wagtail 1.2 instead. 
Scheduling these for deprecation in 1.1 was an error, since the changes were only made in 1.0 and our standard policy is to remove deprecated features two versions later.
 2015-06-23 16:34:15 +01:00
Matt Westcott
5d4c42060e Add upgrade consideration note for IMAGE_COMPRESSION_QUALITY 2015-06-23 16:29:25 +01:00
Karl Hobley
6328dc5f38 master is now 1.1 pre-alpha 2015-06-23 15:36:45 +01:00
Chris Rogers
a25d630692 minor docs readme change 2015-06-23 14:54:35 +01:00
Chris Rogers
bdb7b27d6f Merge pull request #1430 from ryneeverett/tutorial-blog-template 
Add basic blog template to tutorial.
 2015-06-23 12:39:45 +01:00
Tim Heap
80cfab087c Allow filters in the {% image %} image variable 
Now it is possible to do something like:

    {% image primary_img|default:secondary_img width-500 %}
 2015-06-23 12:07:03 +10:00
Tom Dyson
e074aaf5bb Merge pull request #1431 from kaedroho/writing-templates-cleanup 
"Writing templates" cleanup
 2015-06-22 10:48:32 +01:00