Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #702 from jdufresne/rm-debug-print | David Lord | 2017-04-09 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove print() output during test | |||||
| * | | | | | | | Remove print() output during test | Jon Dufresne | 2017-04-09 | 1 | -1/+0 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Looks like it was left in from debugging. | |||||
* | | | | | | | Merge pull request #701 from jdufresne/trove-36 | David Lord | 2017-04-09 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add trove classifier for Python 3.6 | |||||
| * | | | | | | Add trove classifier for Python 3.6 | Jon Dufresne | 2017-04-09 | 1 | -0/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #700 from brunodoamaral/patch-1 | David Lord | 2017-04-05 | 1 | -4/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed incorrect merge in setup.py | |||||
| * | | | | | | Fixed incorrect merge in setup.py | Bruno Guberfain do Amaral | 2017-04-05 | 1 | -4/+0 | |
|/ / / / / / | | | | | | | | | | | | | I just don't know if the correct version is 2.9.7.dev or 2.10.dev | |||||
* | | | | | | Merge branch 'master' of github.com:pallets/jinja | Armin Ronacher | 2017-04-03 | 3 | -3/+6 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #693 from tedder/multiple_argument_select_documentation | David Lord | 2017-03-17 | 1 | -0/+3 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | add examples showing > 1 argument in filter | |||||
| | * | | | | | | add examples showing > 1 argument in filter | tedder | 2017-03-17 | 1 | -0/+3 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | This is implied but poorly documented. A few examples make it clear. | |||||
| * | | | | | | Use proper `versionadded` annotation in docs | Adrian Moennich | 2017-02-26 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | bdist_wheel replaces wheel | Jeff Widman | 2017-02-10 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | | | | | | | https://packaging.python.org/distributing/#universal-wheels | |||||
* | | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-04-03 | 7 | -6/+29 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | 2.9.7-dev | Armin Ronacher | 2017-04-03 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Bump version number to 2.9.62.9.6 | Armin Ronacher | 2017-04-03 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Updated release command | Armin Ronacher | 2017-04-03 | 2 | -4/+1 | |
| | | | | | ||||||
| * | | | | Set release date | Armin Ronacher | 2017-04-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix custom contexts in fast resolve mode | Adrian Moennich | 2017-03-15 | 3 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | closes #675 | |||||
| * | | | | Fix typo (#687) | Daniel van Flymen | 2017-03-01 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-28 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | 2.9.6-dev | Armin Ronacher | 2017-01-28 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Bump version number to 2.9.52.9.5 | Armin Ronacher | 2017-01-28 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Set date for 2.9.5 | Armin Ronacher | 2017-01-28 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-28 | 4 | -1/+38 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Fixed async macro autoescape. Fixes #671 | Armin Ronacher | 2017-01-28 | 4 | -1/+38 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-24 | 3 | -101/+55 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Reduce unused unicodedata dump. Fixes #666 | Armin Ronacher | 2017-01-24 | 3 | -101/+55 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-24 | 3 | -3/+10 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Resolved extends errors in async mode (Fixes #668) | Armin Ronacher | 2017-01-24 | 3 | -3/+10 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-24 | 3 | -0/+12 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Correctly use buffer for else frame in loops. Fixes #669 | Armin Ronacher | 2017-01-24 | 3 | -0/+12 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Markus Unterwaditzer | 2017-01-24 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | fix failing tests: removed some broken code (#661) | Andrew Arendt | 2017-01-24 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | Added changelog entry for #658 | Armin Ronacher | 2017-01-12 | 2 | -1/+6 | |
| | | | | | ||||||
* | | | | | Add "is in" containment test (#658) | Dirk D | 2017-01-12 | 2 | -1/+20 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:pallets/jinja | Armin Ronacher | 2017-01-12 | 1 | -2/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix failing tests: removed some broken code (#661) | Andrew Arendt | 2017-01-12 | 1 | -2/+0 | |
| | | | | | | ||||||
* | | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 3 | -10/+76 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | Add support back for custom resolves on old resolve method | Armin Ronacher | 2017-01-12 | 3 | -10/+76 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 1 | -0/+18 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Added a note for #657 | Armin Ronacher | 2017-01-12 | 1 | -0/+18 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 2 | -1/+5 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Also restore original str method | Armin Ronacher | 2017-01-12 | 2 | -1/+5 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 3 | -0/+20 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Restore original tuple repr for grouper. Fixes #654 | Armin Ronacher | 2017-01-12 | 3 | -0/+20 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 1 | -0/+31 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Added a note on loop scoping | Armin Ronacher | 2017-01-12 | 1 | -0/+31 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 1 | -0/+7 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Added another regression test for ansible/ansible#20063 | Armin Ronacher | 2017-01-12 | 1 | -0/+7 | |
| | | | | | ||||||
* | | | | | Merge branch '2.9-maintenance' | Armin Ronacher | 2017-01-12 | 1 | -0/+7 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Added a test for an assumed regression (refs #659) | Armin Ronacher | 2017-01-12 | 1 | -0/+7 | |
| | | | | |