0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00
Commit Graph

5022 Commits

Author SHA1 Message Date
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
ticti
33dc914f01 Add CSS class to wagtail richtext editor buttons. 2015-09-17 23:19:11 +10: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
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
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
Michael Cordover
a506d7adf0 Fix issue #1678
Add tests for URLs containing paramters.

Keep parameters in wagtailredirect.models.Redirect.normalise_url() like we do query strings: sorted alphabetically but otherwise must be identical
2015-09-14 20:32:08 +10:00
Nick Smith
db14a1dcf4 Document ineffectiveness of specifying Page._meta.ordering 2015-09-11 16:40:23 +01:00
Matt Westcott
799d0dd3ff Version bump master to 1.2a1 2015-09-09 15:24:47 +01:00
Matt Westcott
9ea7cd9f99 Release note for #1620 2015-09-09 15:23:29 +01:00
Matt Westcott
24f5b78588 Merge pull request #1620 from gasman/fix/page-permission-formset-cleanup
Fix behaviour of page permission formset on groups admin
2015-09-09 15:18:47 +01:00
Matt Westcott
755f991627 fix jscs warning 2015-09-09 15:00:05 +01:00
Matt Westcott
7768d57d2f Move JS code shared between add group/delete group views into an include 2015-09-09 12:19:43 +01:00
Matt Westcott
1c4a34b9c8 Refactor page permission formset on group add page to not rely on edit-handler logic 2015-09-09 12:19:43 +01:00
Matt Westcott
d180116ea0 Refactor page permission formset on group edit page to not rely on edit-handler logic 2015-09-09 12:19:43 +01:00
Matt Westcott
73dee9898c Bump version to 1.1rc1 2015-09-04 14:52:57 +01:00
Matt Westcott
c5f72e1ce7 Merge branch 'kaedroho-quick-fix-1665' 2015-09-04 14:50:19 +01:00
Matt Westcott
5ecc69c7a0 Release note for #1666 2015-09-04 14:50:04 +01:00
Matt Westcott
07e37af3eb Assert that an error message is present 2015-09-04 14:48:51 +01:00
Matt Westcott
2d90d0dbf2 Merge branch 'quick-fix-1665' of https://github.com/kaedroho/wagtail into kaedroho-quick-fix-1665 2015-09-04 14:36:08 +01:00
Matt Westcott
d113390ab4 failing test for #1665 2015-09-04 14:35:43 +01:00
Matt Westcott
dc655192fe Release notes for new translations 2015-09-04 14:21:55 +01:00
Karl Hobley
04dcc6984c Add error_messages attribute to UserCreationForm
Fixes #1665
2015-09-04 14:19:11 +01:00
Matt Westcott
d64111f689 Pull new translations from Transifex 2015-09-04 13:54:06 +01:00
Matt Westcott
335d3650cf Merge branch 'takeflight-refactor/is_abstract' 2015-09-04 12:42:46 +01:00
Matt Westcott
c17c7b1b87 Release note and upgrade consideration for #1631 2015-09-04 12:42:36 +01:00
Matt Westcott
c3beacacf0 Test that the deprecated is_abstract=True flag is equivalent to is_creatable=False 2015-09-04 12:19:50 +01:00