0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Commit Graph

5423 Commits

Author SHA1 Message Date
Matt Westcott
d06c5070cc Release note for #1725 2015-10-23 12:31:07 +01:00
Alex Gleason
a89b981a47 Fixed StreamField hover jitter 2015-10-23 12:27:21 +01:00
Matt Westcott
f2df102aac Merge branch 'kaedroho-fix/1859' 2015-10-23 12:22:42 +01:00
Matt Westcott
2631067554 Merge branch 'fix/1859' of https://github.com/kaedroho/wagtail into kaedroho-fix/1859 2015-10-23 12:16:21 +01:00
Matt Westcott
dc02375cc8 Merge branch 'takeflight-merge-settings' 2015-10-23 11:54:47 +01:00
Matt Westcott
a51fdf1279 Release note for #1754 2015-10-23 11:54:27 +01:00
Matt Westcott
735082e927 use URL namespace for wagtailsettings 2015-10-23 11:41:28 +01:00
Karl Hobley
12c58384b2 Tests for searching with multiple fields 2015-10-23 11:40:18 +01:00
Karl Hobley
ab16d379e0 Fixed invalid search query when searching single field with "and" operator
Fixes #1859
2015-10-23 11:36:49 +01:00
Matt Westcott
ed84057b07 static path for wagtail.contrib.settings should be 'wagtailsettings' to avoid name clashes 2015-10-23 11:33:48 +01:00
Matt Westcott
66f595cb5d edit_current_site redirect should not break when request.site is undefined 2015-10-23 11:27:47 +01:00
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
f0dc919e5d Apply dropdown styling to foreign key fields
The dropdown for foreign key was missing the arrow styling.
2015-10-21 23:25:04 -06: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
Denis Voskvitsov
4d04e73674 Update gulp-sass to 2.0.x 2015-10-21 12:19:24 +03: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