summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #702 from jdufresne/rm-debug-printDavid Lord2017-04-091-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove print() output during test
| * | | | | | | Remove print() output during testJon Dufresne2017-04-091-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Looks like it was left in from debugging.
* | | | | | | Merge pull request #701 from jdufresne/trove-36David Lord2017-04-091-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add trove classifier for Python 3.6
| * | | | | | Add trove classifier for Python 3.6Jon Dufresne2017-04-091-0/+1
|/ / / / / /
* | | | | | Merge pull request #700 from brunodoamaral/patch-1David Lord2017-04-051-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed incorrect merge in setup.py
| * | | | | | Fixed incorrect merge in setup.pyBruno Guberfain do Amaral2017-04-051-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/jinjaArmin Ronacher2017-04-033-3/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #693 from tedder/multiple_argument_select_documentationDavid Lord2017-03-171-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | add examples showing > 1 argument in filter
| | * | | | | | add examples showing > 1 argument in filtertedder2017-03-171-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This is implied but poorly documented. A few examples make it clear.
| * | | | | | Use proper `versionadded` annotation in docsAdrian Moennich2017-02-261-2/+2
| | | | | | |
| * | | | | | bdist_wheel replaces wheelJeff Widman2017-02-101-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | https://packaging.python.org/distributing/#universal-wheels
* | | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-04-037-6/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | 2.9.7-devArmin Ronacher2017-04-032-2/+2
| | | | |
| * | | | Bump version number to 2.9.62.9.6Armin Ronacher2017-04-032-2/+2
| | | | |
| * | | | Updated release commandArmin Ronacher2017-04-032-4/+1
| | | | |
| * | | | Set release dateArmin Ronacher2017-04-031-1/+1
| | | | |
| * | | | Fix custom contexts in fast resolve modeAdrian Moennich2017-03-153-1/+23
| | | | | | | | | | | | | | | | | | | | closes #675
| * | | | Fix typo (#687)Daniel van Flymen2017-03-011-1/+1
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-281-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 2.9.6-devArmin Ronacher2017-01-282-2/+2
| | | | |
| * | | | Bump version number to 2.9.52.9.5Armin Ronacher2017-01-282-2/+2
| | | | |
| * | | | Set date for 2.9.5Armin Ronacher2017-01-281-1/+1
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-284-1/+38
|\ \ \ \ \ | |/ / / /
| * | | | Fixed async macro autoescape. Fixes #671Armin Ronacher2017-01-284-1/+38
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-243-101/+55
|\ \ \ \ \ | |/ / / /
| * | | | Reduce unused unicodedata dump. Fixes #666Armin Ronacher2017-01-243-101/+55
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-243-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Resolved extends errors in async mode (Fixes #668)Armin Ronacher2017-01-243-3/+10
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-243-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | Correctly use buffer for else frame in loops. Fixes #669Armin Ronacher2017-01-243-0/+12
| | | | |
* | | | | Merge branch '2.9-maintenance'Markus Unterwaditzer2017-01-240-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | fix failing tests: removed some broken code (#661)Andrew Arendt2017-01-241-2/+0
| | | | |
* | | | | Added changelog entry for #658Armin Ronacher2017-01-122-1/+6
| | | | |
* | | | | Add "is in" containment test (#658)Dirk D2017-01-122-1/+20
| | | | |
* | | | | Merge branch 'master' of github.com:pallets/jinjaArmin Ronacher2017-01-121-2/+0
|\ \ \ \ \
| * | | | | fix failing tests: removed some broken code (#661)Andrew Arendt2017-01-121-2/+0
| | | | | |
* | | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-123-10/+76
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Add support back for custom resolves on old resolve methodArmin Ronacher2017-01-123-10/+76
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-121-0/+18
|\ \ \ \ \ | |/ / / /
| * | | | Added a note for #657Armin Ronacher2017-01-121-0/+18
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-122-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Also restore original str methodArmin Ronacher2017-01-122-1/+5
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-123-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | Restore original tuple repr for grouper. Fixes #654Armin Ronacher2017-01-123-0/+20
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-121-0/+31
|\ \ \ \ \ | |/ / / /
| * | | | Added a note on loop scopingArmin Ronacher2017-01-121-0/+31
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-121-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Added another regression test for ansible/ansible#20063Armin Ronacher2017-01-121-0/+7
| | | | |
* | | | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-121-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Added a test for an assumed regression (refs #659)Armin Ronacher2017-01-121-0/+7
| | | | |