summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* drop internal function namesoperator-testsDavid Lord2017-01-201-5/+0
* user operator module instead of custom functionsDavid Lord2017-01-201-70/+25
* allow using comparison operator symbols as testsDavid Lord2017-01-192-39/+79
* 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
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-101-1/+1
|\ \ | |/
| * 2.9.5-devArmin Ronacher2017-01-102-2/+2
| * Bump version number to 2.9.42.9.4Armin Ronacher2017-01-102-2/+2
| * 2.9.4Armin Ronacher2017-01-101-1/+1
* | Merge branch 'master' of github.com:pallets/jinjaArmin Ronacher2017-01-102-2/+33
|\ \
| * | Improve issue templateAdrian2017-01-092-2/+33
* | | Merge branch '2.9-maintenance'Armin Ronacher2017-01-104-1/+15
|\ \ \ | |/ / |/| / | |/
| * Allow to reconfigure the default for truncate leewayArmin Ronacher2017-01-104-1/+15
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-093-2/+8
|\ \ | |/
| * Resolved bad code generation on toplevel ifsArmin Ronacher2017-01-093-2/+8
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-095-33/+110
|\ \ | |/
| * Correctly scope loop filters. Fixes #649Armin Ronacher2017-01-095-33/+110
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-0913-18/+10
|\ \ | |/
| * Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenanceArmin Ronacher2017-01-0911-17/+7
| |\
| | * Show 2.9 build badge instead of 2.7 in READMEAdrian2017-01-091-1/+1
| | * Remove unused/duplicate importsAdrian Moennich2017-01-097-13/+3
| | * Fix another invalid \s escale sequenceAdrian Moennich2017-01-091-1/+1
| | * Move regex flags to separate argumentAdrian Moennich2017-01-091-1/+1
| | * Enable py36 in tox.iniAdrian Moennich2017-01-091-1/+1
| * | Increment bytecode cache version. Fixes #650Armin Ronacher2017-01-092-1/+3
| |/
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-084-6/+12
|\ \ | |/
| * Fixed some string literal warnings. Fixes #646Armin Ronacher2017-01-084-6/+12
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-081-1/+1
|\ \ | |/
| * 2.9.4-devArmin Ronacher2017-01-082-2/+2
| * Bump version number to 2.9.32.9.3Armin Ronacher2017-01-082-2/+2
| * 2.9.3Armin Ronacher2017-01-081-1/+1
* | Merge branch '2.9-maintenance'Armin Ronacher2017-01-087-20/+102
|\ \ | |/
| * Implement with-tag with a custom nodeArmin Ronacher2017-01-087-11/+56
| * Added test for the scope nodeArmin Ronacher2017-01-081-0/+33