Matt Westcott
42af5c10af
Merge branch 'merge-settings' of https://github.com/takeflight/wagtail into takeflight-merge-settings
2015-10-23 10:31:27 +01:00
Matt Westcott
94ee586276
Merge branch 'master' of https://github.com/torchbox/wagtail
...
Conflicts:
CHANGELOG.txt
docs/releases/1.2.rst
2015-10-23 10:00:52 +01:00
Matt Westcott
8162003eb4
Merge branch 'alexgleason-fixbug-1298'
2015-10-23 10:00:02 +01:00
Matt Westcott
4d4cced717
Release note for #1596
2015-10-23 09:59:41 +01:00
Karl Hobley
ad4007f406
Release note for #1856
2015-10-23 09:57:01 +01:00
Matt Westcott
2bd720497e
Merge branch 'fixbug-1298' of https://github.com/alexgleason/wagtail into alexgleason-fixbug-1298
2015-10-23 09:52:52 +01:00
Karl Hobley
b7f0766e18
Merge pull request #1809 from gasman/cleanup/wagtailforms-page-editor-js
...
Remove useless empty page-editor.js from wagtailforms
2015-10-23 09:47:24 +01:00
Karl Hobley
f12077af24
Merge pull request #1856 from laidibug/issue/1721
...
Fix search on specific page class using the page queryset.
2015-10-23 09:29:18 +01:00
Karl Hobley
101726b76e
Fixed capitalisation of REST
2015-10-22 17:32:57 +01:00
Matt Westcott
3e8b90e4b6
Merge branch 'master' of https://github.com/torchbox/wagtail
2015-10-22 17:24:54 +01:00
Matt Westcott
c4738fc3d5
Merge branch 'kaedroho-drf-browsable-api'
2015-10-22 17:24:42 +01:00
Matt Westcott
33e4a7497f
Release note / documentation update for #1790
2015-10-22 17:23:17 +01:00
Ashia
0791dc3309
Fix search on specific page class using the page queryset.
...
Searching on a specific page type and using the page queryset
results in a missing FilterField message for "page_ptr_id".
The where node query is used to build the list of filters
and xxxx_ptr_id shows up when we use any inherited model and query
by the id. It's best to just ignore this as its useless to
filter search on a pointer field.
We could define it as a FilterField on the Page model, but this
way it prevents other indexed Django models from hitting the same problem.
2015-10-21 20:16:54 -06:00
Matt Westcott
5b0a696bb6
Merge pull request #1851 from gasman/fix/db-index-page-first-published-at
...
Add db index on Page.first_published_at
2015-10-21 16:13:45 +01:00
Matt Westcott
5285a9a915
Add db index on Page.first_published_at
2015-10-21 14:04:50 +01:00
Karl Hobley
f7e19f2a06
Merge pull request #1849 from gasman/feature/page-chooser-search-pagination
...
Add pagination to page chooser search
2015-10-21 10:58:36 +01:00
Matt Westcott
5dc7e00ccd
Add pagination to page chooser search
2015-10-21 10:38:35 +01:00
Karl Hobley
65688a75d0
Merge pull request #1846 from gasman/fix/snippet-chooser
...
Test for correct exception in BaseChooserPanel.get_chosen_item - fixes #1834
2015-10-21 10:24:30 +01:00
Tim Heap
5d81269548
Add site switcher to header in settings
2015-10-21 16:39:09 +11:00
Tim Heap
72c81e8317
Use the change permission for settings models
...
Instead of checking for any kind of permission, the change permission is
used to allow/disallow peoples access to change a setting. The change
permission for each setting has added to the Group editing view with
`register_permission`.
2015-10-21 16:39:09 +11:00
Tim Heap
d0ed1120ee
Hide settings menu items if the user does not have permission
2015-10-21 16:39:09 +11:00
Tim Heap
c9f73d3157
Fix typo in settings docs
2015-10-21 16:39:09 +11:00
Tim Heap
3d494fb24b
Move wagtailsettings into contrib module
...
The `wagtailsettings` module is useful enough that it should be included
in the Wagtail contrib section, to make it available to all Wagtail
developers.
All the code has been given a once-over to make sure it is nice and
polished before being copied in. As such, this is not a direct copy of
the `wagtailsettings` module. It should be backwards compatible though,
excepting the new location.
It has been moved to `wagtail.contrib.settings`, following the naming
scheme set out in #1504 .
Documentation has been concatenated in to a single page, and added to
the contrib reference section.
2015-10-21 16:39:09 +11:00
Matt Westcott
f8a1627ff7
Fix typo / PEP8
2015-10-20 14:40:04 +01:00
Karl Hobley
8c114c1334
Disable browsable API when rest_framework is not installed
2015-10-20 14:40:03 +01:00
Karl Hobley
8e20652579
Display deprecation warning when wagtailapi used without rest_framework
2015-10-20 14:40:03 +01:00
Karl Hobley
95f5c16cee
Allow "format" GET parameter
...
Used in the browsable API to allow the user to explicitly ask for JSON format (eg ?format=json)
2015-10-20 14:40:03 +01:00
Karl Hobley
1e73eb9419
Enable DRFs browsable API
2015-10-20 14:40:03 +01:00
Matt Westcott
2eb4b4c2c1
Release notes for #1810 , #1835 , #1812
2015-10-20 11:16:09 +01:00
Matt Westcott
69e277e5f5
Merge branch 'overcastsoftware-master'
2015-10-20 10:37:28 +01:00
Matt Westcott
6994f7b7b5
Release note for #1843
2015-10-20 10:37:04 +01:00
Matt Westcott
6cb450e28e
Merge branch 'master' of https://github.com/overcastsoftware/wagtail into overcastsoftware-master
2015-10-20 10:20:34 +01:00
Matt Westcott
ec7bd3bdb5
Test for the correct exception in BaseChooserPanel.get_chosen_item - fixes #1834
2015-10-19 22:45:49 +01:00
Matt Westcott
d7ab458b36
fix jslint complaint
2015-10-19 22:45:24 +01:00
Sævar Öfjörð Magnússon
31358535b1
Remove the length argument to URLify
...
The URLify function supplied by django does not need a length argument in order to work. The problem with supplying the length argument is that when you have Unicode characters that are translated to two characters in the slug version, the resulting slug will be missing one character for each such double character.
Example:
Æ or æ is translated as ae when slugified.
A call to URLify would then be: URLify("kjaftæði", 8) which would result in the slug "kjaftaed", since the slug is 9 characters in length due to æ being expanded to two characters. URLify("kjaftæði") works fine and returns "kjaftaedi".
2015-10-19 15:57:16 +00:00
Matt Westcott
3b882dd1e9
Merge branch 'kaedroho-wagtailapirouter'
2015-10-19 14:12:16 +01:00
Matt Westcott
c0c9972aca
Merge branch 'wagtailapirouter' of https://github.com/kaedroho/wagtail into kaedroho-wagtailapirouter
2015-10-19 13:11:56 +01:00
Karl Hobley
26889ba128
Merge pull request #1812 from gasman/feature/block-template-context
...
Allow block subclasses to pass extra context variables to templates
2015-10-19 09:29:59 +01:00
Karl Hobley
37685dee6f
Merge pull request #1835 from gasman/fix/empty-explorer-menu
...
If explorer nav menu is empty, take user directly to the explorer view
2015-10-19 09:26:50 +01:00
Karl Hobley
88aab062ec
Merge pull request #1810 from gasman/fix/preserve-slug
...
Avoid auto-updating slug on live pages
2015-10-19 09:18:49 +01:00
Matt Westcott
29a62f6b16
Merge pull request #1838 from timorieber/cleanup/vagrant
...
Removed Vagrantfile from startproject command
2015-10-16 23:57:00 +01:00
Timo Rieber
a990bccff4
Removed Vagrantfile from startproject command
2015-10-17 00:14:55 +02:00
Matt Westcott
0c93d133c3
Merge branch 'JoshBarr-docs/signals'
2015-10-16 17:24:58 +01:00
Matt Westcott
1c115ca429
Add Josh Barr to contributors
2015-10-16 17:24:24 +01:00
Matt Westcott
141129f587
Merge branch 'docs/signals' of https://github.com/JoshBarr/wagtail into JoshBarr-docs/signals
2015-10-16 17:23:04 +01:00
Karl Hobley
db49484201
Docstrings for router class
2015-10-16 13:19:38 +01:00
Karl Hobley
5733f16002
Refactored detail_url calculation into function
2015-10-16 13:19:38 +01:00
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
