mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
4 990 Commity
55 Gałęzie
258 Tagi
410 MiB
Wykres commitów

4990 Commity (dbb6fe73ada76de7ddf12742712f228af5bee893)

Autor SHA1 Wiadomość Data
Matt Westcott dbb6fe73ad Merge branch 'master' of https://github.com/torchbox/wagtail 2015-09-30 17:16:56 +01:00
Matt Westcott a02cc3e67c Release note for #1744 2015-09-30 17:16:48 +01:00
Tom Dyson e162730acb Merge pull request #1759 from gasman/doc/developer-setup 
Rewrite developer setup docs
 2015-09-30 16:59:43 +01:00
Matt Westcott 5a67971d1d Merge branch 'refactor/jinja-support' of https://github.com/takeflight/wagtail 2015-09-30 16:48:21 +01:00
Matt Westcott 1afc5ba0f1 Transferred vagrant-wagtail-develop repo to torchbox 2015-09-30 16:24:42 +01:00
Matt Westcott 377db9e878 Rewrite developer setup docs 
* State the requirement for Node.js up-front (since it's required by everyone, not just front-end devs)
* Point to vagrant-wagtail-develop instead of making people set up a Vagrant instance manually
* No need to fiddle with python paths via local.py - 'setup.py develop' handles that
* Skip instructions for virtualenvs (anyone who decides against the Vagrant route is expected to know how to use them)
 2015-09-30 15:54:08 +01:00
Karl Hobley 7de03ef8c4 Merge pull request #1739 from JoshBarr/docs/sitemap-clarification 
Added section on hostnames to Sitemaps docs
 2015-09-28 13:25:29 +01:00
Tim Heap 8aa5bdfddf Check both `page` and `self` in templatetag contexts 
Old code that does not properly extend `Page.get_context()` for context
generation will not get the new `PAGE_TEMPLATE_VAR` in their contexts,
which did not play nicely with the `wagtailuserbar`. Now, the template
context is checked for both `PAGE_TEMPLATE_VAR` and `self`, in that
order, for a Page.
 2015-09-28 11:00:56 +10:00
Josh Barr 221a3e5254 added docs about hostnames 2015-09-27 01:41:52 +12:00
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
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 16020af213 Loudly highlight the fact that libjpeg and zlib are required 2015-09-22 22:54:47 +01: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
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