0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Commit Graph

5223 Commits

Author SHA1 Message Date
Tim Heap
cf7aaae09c Add tests for Jinja template tags 2015-10-01 20:04:06 +10:00
Tim Heap
e225481f2f Add documentation for using Jinja2 2015-10-01 16:00:40 +10:00
Tim Heap
02e4288b15 Add wagtailuserbar() Jinja function 2015-10-01 14:59:13 +10:00
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
Tim Heap
de88f90b36 Add rudimentary Jinja2 template tag support
The following tags and filters are supported:

* `wagtailcore`:
  * `pageurl()`
  * `slugurl()`
  * `wagtail_version()`
  * `|pageurl`
* `wagtailimages`:
  * `image()`

Django template tags have been translated to Jinja functions, rather
than custom tags. Functions are easier to use compared to template tags,
and can be composed and combined for greater flexibility.

The template tag libraries have been grouped as Jinja Extensions, which
are loadable via the `extensions` option. An example Django Jinja2
configuration is:

```python
TEMPLATES = [
    # ...
    {
        'BACKEND': 'django.template.backends.jinja2.Jinja2',
        'APP_DIRS': True,
        'OPTIONS': {
            'extensions': [
                'wagtail.wagtailcore.templatetags.jinja2.core',
                'wagtail.wagtailimages.templatetags.jinja2.images',
            ],
        },
    },
]
```
2015-09-30 18:50:57 +10: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
Petr Vacha
68393240da Added assertNotContains multipart for SimplePage. 2015-09-28 01:36:45 +02:00
Petr Vacha
4fd725ffa9 Added tests for multipart forms. 2015-09-28 01:25:59 +02:00
Petr Vacha
a61327c92c Set enctype as multipart if form.is_multipart returns true. 2015-09-27 10:37:21 +02: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
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