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

5363 Commity (23ed5392de1dfc67031aa04190c2097d74f7ae5c)

Autor SHA1 Wiadomość Data
Karl Hobley de689215b0 Removed WagtailJSONRenderer 2015-10-16 13:19:37 +01:00
Karl Hobley 789cbabebf Get detail_url values from router 
No longer need ObjectDetailURL!
 2015-10-16 13:19:37 +01:00
Karl Hobley ed42eb001d RelatedField and ChildRelation now pass down context 2015-10-16 13:19:37 +01:00
Karl Hobley c813a2c682 Removed URLPath 
Replaced with calls to get_full_url in serializers.py
 2015-10-16 13:19:37 +01:00
Karl Hobley 1e1077f891 Added WagtailAPIRouter 2015-10-16 13:19:37 +01:00
Matt Westcott a3473544b8 Merge pull request #1785 from takeflight/bug/asset-compilation 
Fix bug where built assets may not be packaged
 2015-10-16 12:31:18 +01:00
Matt Westcott c06a2cde85 Merge pull request #1772 from kaedroho/api-tweaks2 
Cleanup in WagtailAPI module
 2015-10-16 12:24:35 +01:00
Matt Westcott 5c1abe3a86 Merge branch 'mayapurmedia-set_multipart' 2015-10-16 12:12:13 +01:00
Matt Westcott bce6fba24f Release note for #1741 2015-10-16 12:12:07 +01:00
Matt Westcott 6310c906ee Merge branch 'set_multipart' of https://github.com/mayapurmedia/wagtail into mayapurmedia-set_multipart 2015-10-16 11:42:05 +01:00
Matt Westcott f63986f47d If explorer nav menu is empty, take user directly to the explorer view 2015-10-15 22:37:22 +01:00
Matt Westcott 749258ebbb Merge pull request #1828 from jheasly/patch-1 
Docs fix: Need to flip order of class creation
 2015-10-15 11:40:45 +01:00
Matt Westcott c0f390a9c2 Merge branch 'timorieber-cleanup/project-template-documentation' 2015-10-15 09:22:00 +01:00
Matt Westcott bebc4d4ed3 Remove mention of SASS / django-compressor; fix minor text errors 2015-10-15 09:21:47 +01:00
Matt Westcott e1b564ee80 Merge branch 'cleanup/project-template-documentation' of https://github.com/timorieber/wagtail into timorieber-cleanup/project-template-documentation 2015-10-15 09:18:42 +01:00
Timo Rieber f522b146b3 Removed vagrant configuration section 2015-10-15 08:11:16 +02:00
Timo Rieber 8e2c5cfd87 Synced structure to reflect current project template 2015-10-15 08:10:27 +02:00
Petr Vacha c6bb0adac7 Merge with latest version, fixing conflicts. 2015-10-15 10:19:34 +05:30
John Heasly d87d737f52 Need to flip order of class creation 
Need to flip order of creating `BlogIndexRelatedLink` and `BlogIndexPage`, otherwise `BlogIndexRelatedLink` references `BlogIndexPage` before it's been created and you get:
```bash
ERRORS:
blog.BlogIndexRelatedLink.page: (fields.E300) Field defines a relation with model 'BlogIndexPage', which is either not installed, or is abstract.
```
 2015-10-14 17:29:19 -07:00
Matt Westcott 30d5b62eed Fix broken link to topics/pages 2015-10-14 17:28:49 +01:00
Matt Westcott 14b1fa68b8 Merge branch 'kaedroho-issue/1671' 2015-10-14 17:26:12 +01:00
Matt Westcott da42620089 Release note for #1791 2015-10-14 17:26:03 +01:00
Matt Westcott e946215817 Merge branch 'issue/1671' of https://github.com/kaedroho/wagtail into kaedroho-issue/1671 2015-10-14 17:23:49 +01:00
Matt Westcott 148f05e0d2 Merge branch 'RyanPineo-fix-page-edit-publish-view-live-url' 2015-10-14 17:16:34 +01:00
Matt Westcott 7e7ba37639 Release note for #1770 2015-10-14 17:16:21 +01:00
Matt Westcott bf0166945c reword comment - the URL *may* have changed 2015-10-14 17:11:59 +01:00
Matt Westcott 33faa40ecd Merge branch 'fix-page-edit-publish-view-live-url' of https://github.com/RyanPineo/wagtail into RyanPineo-fix-page-edit-publish-view-live-url 2015-10-14 17:09:59 +01:00
Matt Westcott e45b73fd0b Merge branch 'kaedroho-html-comments-in-rich-text' 2015-10-14 17:07:44 +01:00
Matt Westcott bb8894aa6c Release note for #1821 2015-10-14 17:07:26 +01:00
Matt Westcott 55e98db83a Merge branch 'html-comments-in-rich-text' of https://github.com/kaedroho/wagtail into kaedroho-html-comments-in-rich-text 2015-10-14 16:57:34 +01:00
Karl Hobley e6fcb9e504 Merge pull request #1811 from gasman/fix/frontend-search-use-queryset 
Update frontend search to use queryset-based search method
 2015-10-14 16:21:33 +01:00
Matt Westcott baf36e0111 Merge branch 'kaedroho-docs-self-var' 2015-10-14 15:26:04 +01:00
Matt Westcott 9b6a389850 Add note about variable names to Jinja2 release notes 2015-10-14 15:25:40 +01:00
Matt Westcott c1edbe6a98 Merge branch 'docs-self-var' of https://github.com/kaedroho/wagtail into kaedroho-docs-self-var 2015-10-14 14:52:00 +01:00
Karl Hobley ed1a0f9bb1 Merge pull request #1823 from gasman/fix/page-manager-from-queryset 
Eliminate duplicated PageQuerySet methods / make `sibling_of` behaviour consistent
 2015-10-14 14:35:14 +01:00
Matt Westcott 142647ca0b Update frontend search to use queryset-based search method - fixes #1808 2015-10-14 12:10:06 +01:00
Matt Westcott 1e6adf2861 Avoid auto-updating slug on live pages - fixes #528 
Rewrite the initSlugAutoPopulate function so that the slug only tracks the
title field if the page is unpublished, AND the current slug matches the
title (indicating that it has not been edited manually, either in this editing
session or a previous one).
 2015-10-14 12:09:19 +01:00
Matt Westcott 055cdef5bd Merge pull request #1793 from takeflight/tests/expectedFailure-streamfield 
Fix expectedFailures for StreamFields
 2015-10-14 11:55:44 +01:00
Tim Heap a9906cf0cb Correctly order sub-blocks in multiply inherited blocks 
Multiply inherited StructBlocks and StreamBlocks now correctly order
their sub-blocks, in reverse MRO order. `declared_blocks` was being
overridden with `base_blocks`, which was screwing with the order.
Additionally, the order of fields when inheriting from multiple parents
is not obvious at first, so a comment has been added to the test
explaining the expected behaviour.
 2015-10-14 11:29:42 +11:00
Tim Heap b6fba1b590 Sanitise value for StructBlocks before rendering 
Only known fields are passed in to the template, instead of allowing any
arbitary data. Additionally, fields in value now appear in the same
order that they are declared in
 2015-10-14 11:29:42 +11:00
Tim Heap aaee8e1576 ChoiceBlock return display value in get_searchable_content 
This fixes a `unittest.expectedFailure`, by rearranging the tests to
test the correct things.

FieldBlocks should not return anything from `get_searchable_content`. It
is up to subclasses to override it and return something relevant.
`ChoiceBlock` overrides it to return the display value of the chosen
item.
 2015-10-14 11:29:42 +11:00
Tim Heap 8e755b7db3 Fix bug where built assets may not be packaged 
The asset compilation that occurs as part of `python setup.py sdist`
would find all the files to include first, then recompile all the
assets, before finally packaging them all up. This means that if a new
file was created as part of the asset compilation that was not there
when all the files were first searched for, that file would not be
included in the package.

Now, the asset compilation happens before the file system is searched
for assets to include, so all assets should always be included.
 2015-10-14 10:58:07 +11:00
Matt Westcott 657dd0e347 Merge branch 'davecranwell-unified-thumbnail-sizes' 2015-10-13 22:46:15 +01:00
Matt Westcott 5bac77a648 Release note for #1822 2015-10-13 22:46:02 +01:00
Matt Westcott 5694dd1994 Merge branch 'unified-thumbnail-sizes' of https://github.com/davecranwell/wagtail into davecranwell-unified-thumbnail-sizes 2015-10-13 22:34:07 +01:00
Matt Westcott 0bb4bac2bc Release note for #1815 2015-10-13 19:32:29 +01:00
Matt Westcott dafbdaf20f Use `Manager.from_queryset` to construct PageManager, to avoid duplication of queryset methods. 
This exposes an inconsistency between the old `PageManager.(not_)sibling_of` method (which was
exclusive by default) and `PageQuerySet.(not_)sibling_of)` (which is inclusive). We therefore
standardise on the inclusive behaviour (in line with treebeard's own sibling methods), and note
this change of behaviour in the release notes.
 2015-10-13 19:15:12 +01:00
Dave Cranwell 575dc2fa81 Removing need for an image rendition required by wagtail out the box, by reusing and shrinking another. 2015-10-13 17:32:30 +01:00
Matt Westcott 928bc0d25f Merge branch 'kaedroho-search-ordering' 2015-10-13 15:27:32 +01:00
Matt Westcott c2a183f19f Documentation tweaks as per https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736415 https://github.com/torchbox/wagtail/pull/1815#commitcomment-13736421 2015-10-13 15:17:47 +01:00