mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
5 496 Commity
56 Gałęzie
257 Tagi
3,4 GiB
Wykres commitów

5496 Commity (0ce27f2f3d10279498c12b07d7d26fc973987b38)

Autor SHA1 Wiadomość Data
Karl Hobley 7a22d1c248 Merge pull request #1866 from gasman/feature/redirect-site-field 
Make Site field editable on redirects
 2015-10-27 10:16:39 +00:00
Matt Westcott 42860fba21 Merge branch 'vden-nodev4-support' 2015-10-27 10:05:21 +00:00
Matt Westcott ba8c02268d Merge branch 'nodev4-support' of https://github.com/vden/wagtail into vden-nodev4-support 2015-10-27 10:02:02 +00:00
Karl Hobley 3d5dd9edbd Merge pull request #1868 from takeflight/bug/remove-six 
Use six from Django, remove six from tox.ini
 2015-10-27 09:22:55 +00:00
Tim Heap b3560b7941 Use six from Django, remove six from tox.ini 
All referencs to `six` were removed in #1411 favouring
`django.utils.six`, except for one in `tox.ini` where it was installed
as a dependency. Because it was still installed in the test environment,
a few references to `six` crept back in. These will cause an ImportError
when users do not have `six` installed.

These references have been fixed, and `six` has been removed from
`tox.ini`
 2015-10-27 16:37:05 +11:00
Matt Westcott e0f7e3d11d Allow re-using the same redirect path on multiple sites - fixes #1672 2015-10-27 01:32:49 +00:00
Matt Westcott 1033897146 Add site column to redirects listing (and show redirects from all sites, not just current one) 2015-10-27 00:42:21 +00:00
Matt Westcott b0878b1534 Make site field editable on redirects 2015-10-27 00:36:33 +00:00
Matt Westcott 93cf24df73 Add tests for page redirects and redirects with specific sites 2015-10-27 00:18:20 +00:00
Matt Westcott d76ada4636 No need to create our own Client instance when using django.test.TestCase 2015-10-26 22:47:28 +00:00
Matt Westcott 6cba9ff204 PEP8 on wagtailredirects/tests.py 2015-10-26 22:47:27 +00:00
Matt Westcott cdf8467bd2 Remove redundant use of EditHandler in wagtailredirects 2015-10-26 22:47:27 +00:00
Matt Westcott 13c8e4da58 Merge branch 'vden-gravatar-idn-email-fix' 2015-10-26 12:58:53 +00:00
Matt Westcott 566fa3a26f Release note for #1670 / #1850 / #1854 2015-10-26 12:58:36 +00:00
Matt Westcott d1ef42fe9b test for #1670 2015-10-26 12:35:58 +00:00
Denis Voskvitsov 0deb2da1af More readable gravatar url formatting 2015-10-26 12:35:58 +00:00
Denis Voskvitsov 9277e8350c PEP8 2015-10-26 12:35:58 +00:00
Denis Voskvitsov 0f9eaf7e8c Force utf-8 encoding of user email in gravatar request 2015-10-26 12:35:58 +00:00
Matt Westcott 838e03a2b5 Merge pull request #1863 from whyfoo/patch-2 
Removed backticks from readme
 2015-10-23 21:12:16 +01:00
Matt Westcott f60387eb9b Merge pull request #1862 from whyfoo/patch-1 
Minor readme tweak
 2015-10-23 21:11:58 +01:00
[Redacted] 199ed87c26 Removed backticks from readme 
Forgot to remove backticks from sphinx
 2015-10-23 22:04:56 +02:00
[Redacted] 8cd6dfe87b Minor readme tweak 2015-10-23 22:02:07 +02:00
Matt Westcott 8c6ffa6f48 Merge branch 'alexgleason-streamfield-hover-jitter' 2015-10-23 12:31:16 +01:00
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