Wykres commitów

5314 Commity (cd168a2b410f60698e8a7f4a2c0fe9187506cc43)

Autor SHA1 Wiadomość Data
Karl Hobley 97eaa045fd Merge pull request #1728 from alexgleason/docs-fix-link-deploy-vagrant-sh
Removed broken link to non-existent vagrant install script
2015-09-23 21:02:08 +01:00
Alex Gleason 6fc2dd4904 Removed broken link to non-existent vagrant install script 2015-09-23 14:51:43 -05:00
Matt Westcott 99b99f28d4 Use lru_cache and 'with open' to clean up code 2015-09-23 10:11:52 +01:00
Karl Hobley ebd01fd1b4 Merge pull request #1719 from nimasmi/custom-queryset-docs
Document custom queryset required approach
2015-09-23 09:52:43 +01:00
Karl Hobley c224002d3e verbose_name should be lowercase 2015-09-23 09:52:26 +01:00
Nick Smith 536c8cd203 Fix typo 2015-09-23 09:42:50 +01:00
Nick Smith dea22d8fe0 Document custom queryset required approach 2015-09-23 09:31:35 +01:00
Matt Westcott 8a98b5ab8c suppress PEP8 warning from unused import 2015-09-23 02:35:38 +01:00
Matt Westcott 1a743366fb Cache the results of has_jpeg_support and has_png_support
This means we can use them on the admin dashboard without performing redundant file/image operations.
2015-09-23 02:29:18 +01:00
Matt Westcott a311955534 Add system check for libjpeg / zlib 2015-09-23 01:34:08 +01:00
Matt Westcott 16020af213 Loudly highlight the fact that libjpeg and zlib are required 2015-09-22 22:54:47 +01:00
Tim Heap 9001abce71 Remove broken and unnecessary test
From https://github.com/torchbox/wagtail/pull/1691#issuecomment-141407634
2015-09-22 09:02:06 +10:00
Dave Cranwell 12fc3e6601 Fixes #1600. Adds documentation and caveats about image formats system within rich text 2015-09-21 14:01:18 +01:00
Matt Westcott 8fd83e3abb Merge branch 'rjsproxy-master' 2015-09-18 16:25:42 +01:00
Matt Westcott c17583b8d1 Release note for #1704 2015-09-18 16:25:27 +01:00
Matt Westcott d18eccc5e8 Use '$' rather than 'jQuery'
The (function($) {...})(jQuery) wrapper ensures that $ is always available.
2015-09-18 16:22:20 +01:00
Matt Westcott caf0bb4366 Merge branch 'master' of https://github.com/rjsproxy/wagtail into rjsproxy-master 2015-09-18 16:03:42 +01:00
Matt Westcott 31db84a216 Changelog for #1692 2015-09-18 11:29:50 +01:00
Matt Westcott 6ffa06624f Merge pull request #1692 from FlipperPA/master
Create custom SQL for SQL Server. Yes, it had to be that ugly, but it…
2015-09-18 11:26:37 +01:00
Alex Gleason ab71cba949 Refactored StreamBlockMenu js 2015-09-17 09:08:37 -05:00
Karl Hobley f45ec08a2c Add first publish/updated dates to search index 2015-09-17 14:31:30 +01:00
Alex Gleason 6e2f4275ca Reformatted code 2015-09-17 08:29:13 -05:00
ticti 33dc914f01 Add CSS class to wagtail richtext editor buttons. 2015-09-17 23:19:11 +10:00
Alex Gleason 0b338d9131 StreamField blocks are now added automatically if there's only one block type 2015-09-16 20:37:52 -05:00
Allen, Timothy 89f9db612d Create custom SQL for SQL Server. Yes, it had to be that ugly, but it works. Falling on my sword over here... 2015-09-16 14:16:49 -07:00
Matt Westcott 8ffe4578a3 Merge branch 'master' of https://github.com/torchbox/wagtail 2015-09-16 17:37:43 +01:00
Matt Westcott 8d123e29e9 version bump to 0.8.10 due to packaging issues (grr)
Conflicts:
	CHANGELOG.txt
	docs/releases/index.rst
	wagtail/project_template/requirements.txt
	wagtail/wagtailcore/__init__.py
2015-09-16 17:36:21 +01:00
Matt Westcott 307b12da52 Prepare for 0.8.9 release
Conflicts:
	CHANGELOG.txt
	wagtail/project_template/requirements.txt
	wagtail/wagtailcore/__init__.py
2015-09-16 17:34:30 +01:00
Matt Westcott d9103f48ec Release note for 5a63a0b 2015-09-16 17:31:51 +01:00
Matt Westcott 9d386cf777 Release note for #1641 (backport to 0.8.x)
Conflicts:
	CONTRIBUTORS.rst
2015-09-16 17:31:37 +01:00
Matt Westcott 76a653e5a6 Release note for #1660 (backport to 0.8.x)
Conflicts:
	CHANGELOG.txt
	docs/releases/index.rst
2015-09-16 17:28:57 +01:00
Maximilian Stauss 9ff7961a3c updated/cleaned settings after suggestions 2015-09-16 12:26:19 -04:00
Tim Heap 98f37bb6ff Remove bare except in unnecessary try block
From a comment by @gasman on #1684:

> It appears the try/catch in ImageEmbedHandler was added here: 74b9f43
>
> Since the rest of the commit doesn't deal with images at all, and the
> commit makes it clear that the corresponding change to
> MediaEmbedHandler was intended to preserve the existing 'fail
> silently' behaviour in the light of the new exceptions added for media
> embeds - I think this try/catch is redundant. `Format.image_to_html`
> does its own catching of image IO errors, which seems to be
> sufficiently robust (if it wasn't, we'd be seeing errors on front-end
> page rendering), so I think this try/catch can reasonably be deleted.

https://github.com/torchbox/wagtail/pull/1684#issuecomment-140695060
2015-09-16 20:51:21 +10:00
Karl Hobley 5e8df2624e Changelog for #1677 and #1679 2015-09-16 09:35:23 +01:00
Karl Hobley 0c7fd8f8eb Move assertion in redirects tests 2015-09-16 09:23:35 +01:00
Karl Hobley c6ecc2d61c Merge pull request #1679 from mjec/issue-1678
Fix issue #1678
2015-09-16 09:22:21 +01:00
Michael Cordover 13c6904598 Provide tests for issue #647 and improve efficiency
Provide test cases for redirects stripping out query string.

Don't repeat database query in middleware if there is no query string.
2015-09-16 09:11:50 +01:00
Michael Cordover aa80e61bef Issue #647
Update redirect middleware to try old_path without query string if we can't find a redirect for old_path with query string
2015-09-16 09:11:14 +01:00
Karl Hobley ca92f5ede0 Merge pull request #1684 from takeflight/refactor/blank-except
Refactor out a bare except: statement
2015-09-16 09:08:53 +01:00
Karl Hobley 7224768550 Merge pull request #1689 from takeflight/python3.5
Add Python 3.5 support
2015-09-16 08:52:07 +01:00
Tim Heap 17daa4112b Add Python 3.5 to tox.ini, travis.yml 2015-09-16 14:18:53 +10:00
Maximilian Stauss 5a4ad20597 updated settings so that there is no decrepation warning
TEMPLATE_DEBUG is now an Option of every template
referenced in
https://docs.djangoproject.com/en/1.8/ref/settings/#template-debug
2015-09-15 16:04:36 -04:00
Karl Hobley f79c108582 Merge pull request #1683 from takeflight/remove-meta-description
Remove uses of Model._meta.description
2015-09-15 16:34:57 +01:00
Matt Westcott 57d37b1154 prepare for 1.1 release
Conflicts:
	CHANGELOG.txt
	wagtail/wagtailcore/__init__.py
2015-09-15 12:45:54 +01:00
Karl Hobley a522e75e25 Moved Django REST Framework support release note into major new features 2015-09-15 12:00:18 +01:00
Karl Hobley c562fc3275 Merge pull request #1681 from gasman/fix/bug-1673
Prevent ContentType db lookup on app load - fixes #1673
2015-09-15 09:47:07 +01:00
Tim Heap fff4568df7 Remove uses of Model._meta.description
Due to harsher restrictions on model Meta attributes in Django 1.6, it
is no longer possible to add a description attribute. This commit
removes any code in Wagtail that still tried to rely on a description
attribute.
2015-09-15 18:36:45 +10:00
Tim Heap 9a81d58bfb Refactor out a bare except: statement
It now catches `Redirect.DoesNotExist`, returning the normal 404 page if
no redirect is found. Any other exception should not be caught here.
2015-09-15 12:03:46 +10:00
Matt Westcott 38e939b5a8 Merge pull request #1676 from nimasmi/page-ordering-docs
Document ineffectiveness of specifying `Page._meta.ordering`
2015-09-14 20:26:52 +01:00
Matt Westcott 43989e7f8c Make target_content_types into a cached property - fixes #1673 2015-09-14 15:48:50 +01:00