Wykres commitów

5040 Commity (ed8399caee1fed82a003db5aee5182bc3c01f4a4)

Autor SHA1 Wiadomość Data
Matt Westcott 8455b7f6b2 Merge branch 'snippets-search' of https://github.com/kaedroho/wagtail into kaedroho-snippets-search
Conflicts:
	wagtail/wagtailsnippets/views/snippets.py
2015-08-25 10:17:12 +01:00
Matt Westcott 89bc404a8a Merge branch 'kaedroho-page-chooser-wagtailsearch' 2015-08-25 10:07:04 +01:00
Matt Westcott 314389f5ef Release note for #1476 2015-08-25 10:06:17 +01:00
Matt Westcott b0524c94cf Merge branch 'page-chooser-wagtailsearch' of https://github.com/kaedroho/wagtail into kaedroho-page-chooser-wagtailsearch 2015-08-25 10:01:37 +01:00
Alex Gleason 6675a738e4 Added comment for Python 2 2015-08-24 18:15:16 -05:00
Karl Hobley 48b0f92961 Tweaks based on feedback from @tomdyson 2015-08-24 12:09:47 +01:00
Karl Hobley 5cd957d264 Explicity set html5lib as BeautifulSoup parser
Fixes some warnings during tests

I also fixed a few import order issues
2015-08-24 10:12:56 +01:00
Karl Hobley ae3c08ad69 Use Djangos JsonResponse class when returning JSON from view 2015-08-24 09:20:03 +01:00
Karl Hobley 868d0fb3e4 Merge pull request #1635 from benebun/benebun-patch-editor_manual
Add several fixes/tweaks for editor manual doc
2015-08-24 09:14:24 +01:00
Tim Heap 537502b521 Add documentation for tagging snippets 2015-08-24 10:22:02 +10:00
Benedikt Breinbauer 7ed22ea7ea Add apostrophe 2015-08-21 18:19:22 +02:00
Benedikt Breinbauer 067b38e9df Add missing verb in editor manual 2015-08-21 18:19:04 +02:00
Benedikt Breinbauer dd6a035e95 Update page type link text in editor manual to match currently used text 2015-08-21 18:11:15 +02:00
Benedikt Breinbauer 3d64afeb52 Add apostrophe 2015-08-21 18:09:52 +02:00
Benedikt Breinbauer f5166be502 Remove reference to RCA in editor manual doc 2015-08-21 18:09:32 +02:00
Benedikt Breinbauer cef785e469 Fix some typos in editor manual doc 2015-08-21 18:09:04 +02:00
Benedikt Breinbauer 4d238ffb6a Use bullet points instead of ordered list consistently 2015-08-21 18:08:24 +02:00
Benedikt Breinbauer 8323a10ecc Update docs with current number of dots in reordering icon 2015-08-21 18:07:34 +02:00
Benedikt Breinbauer d8c58f10f1 Fix some typos in i18n docs 2015-08-21 16:05:44 +01:00
Karl Hobley b8d0541f39 Some edits 2015-08-21 16:00:26 +01:00
Karl Hobley 460517260d Merge pull request #18 from benebun/patch-2
Fix LocaleMiddleware path in i18n docs
2015-08-21 15:04:41 +01:00
Benedikt Breinbauer 4b14962ba3 Fix details in editor manual docs 2015-08-21 15:57:20 +02:00
Karl Hobley 80bf868963 Use StreamingHttpResponse in image serve view
Fixes #1584

This will prevent djangos "UpdateCacheMiddleware" from trying to add the image into the cache.

https://github.com/django/django/blob/master/django/middleware/cache.py#L78-L79
2015-08-21 14:32:31 +01:00
Benedikt Breinbauer 0d040564d6 Fix LocaleMiddleware path in i18n docs 2015-08-21 15:25:48 +02:00
Karl Hobley ee61839fd5 Improvements to internationalisation docs 2015-08-21 11:08:11 +01:00
Karl Hobley 102f8db238 Merge pull request #1628 from takeflight/bug/bad-docs-reference
Remove reference to non-existant page in docs
2015-08-21 09:35:38 +01:00
Alex Gleason e09acbea2d Changed __unicode__ to __str__ 2015-08-20 22:30:55 -05:00
Matt Westcott e73e21a827 grammar fix 2015-08-20 16:57:21 +01:00
Matt Westcott 0bc723b53f Move 'permissions fixes' section of release notes above 'minor features' 2015-08-20 16:54:42 +01:00
Matt Westcott 4657c62326 Release note for #1623 2015-08-20 16:53:56 +01:00
Matt Westcott 87905431b1 Merge branch 'kaedroho-extra-indexes' 2015-08-20 16:51:16 +01:00
Matt Westcott 4e28ad42d0 Merge branch 'extra-indexes' of https://github.com/kaedroho/wagtail into kaedroho-extra-indexes 2015-08-20 16:38:20 +01:00
Karl Hobley 2f223e6a3b Multiple page type support in PageChooserPanel edit handler 2015-08-20 16:24:19 +01:00
Karl Hobley b93afbfeaa Multiple page type support for AdminPageChooser widget 2015-08-20 16:24:19 +01:00
Karl Hobley f3b758bc7d Added tests for AdminPageChooser widget
Looks like a public API to me so deserves some tests/docs
2015-08-20 16:24:19 +01:00
Karl Hobley 7253495124 Added support for multiple page types into page chooser 2015-08-20 16:24:19 +01:00
Karl Hobley ac97197c89 Test for multiple page types in page chooser 2015-08-20 16:23:45 +01:00
Matt Westcott e8a3d7ba88 Make page chooser accept empty page_type parameter again 2015-08-20 16:21:50 +01:00
Matt Westcott 6d802303de Merge branch 'master' of https://github.com/torchbox/wagtail 2015-08-20 12:47:36 +01:00
Matt Westcott 967b3b3afc Merge branch 'kaedroho-page-chooser-cleanup' 2015-08-20 12:47:10 +01:00
Matt Westcott 48dc4b198e Merge branch 'page-chooser-cleanup' of https://github.com/kaedroho/wagtail into kaedroho-page-chooser-cleanup 2015-08-20 12:44:38 +01:00
Karl Hobley a57b432078 Created internationalisation section of the docs 2015-08-20 12:29:25 +01:00
Karl Hobley fca5e10314 Upgrade consideration for EditorsPick model move 2015-08-20 12:26:31 +01:00
Tim Heap d0eadafeb5 Remove reference to non-existant page in docs 2015-08-20 21:02:52 +10:00
Tim Heap 6dc2aecdd0 Add a test for adding and editing tagged snippets 2015-08-20 20:34:52 +10:00
Karl Hobley f47bb70eba Merge pull request #1579 from kaedroho/rest-framework-serializers
Use rest frameworks serializers in API
2015-08-20 11:02:00 +01:00
Karl Hobley 2f472cc48b Make database search use base queryset
Fixes #1276
2015-08-20 10:48:08 +01:00
Karl Hobley 0bf12ca333 Put Page class fallback back
Reverts: 7e16aa0d8d
2015-08-20 10:44:32 +01:00
Karl Hobley 4b3732f8c1 Failing test for #1276 2015-08-20 10:34:23 +01:00
Karl Hobley 4e9932e5a3 Added show_in_menus into Page filter fields 2015-08-20 10:31:12 +01:00