summaryrefslogtreecommitdiff
path: root/jinja2
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branchArmin Ronacher2013-05-181-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | unit test for dumping as utf-8 to a fileAlex Morega2013-05-181-0/+14
* | | | | | | | | Fixed a type in a module name.Armin Ronacher2013-05-181-1/+1
* | | | | | | | | Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branchArmin Ronacher2013-05-184-11/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | stuff missing from previous commit, thanks gitThomas Waldmann2013-05-182-6/+4
| * | | | | | | | new jinja2._compat module for stuff not yet in six 1.3.0Thomas Waldmann2013-05-183-4/+21
* | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-182-4/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #188 from lemonad/masterArmin Ronacher2013-05-182-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed typos: overriden to overriddenJonas Nockert2013-02-232-4/+4
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-181-3/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Added missing versionadded and changelog entryArmin Ronacher2013-05-181-0/+3
| * | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-181-3/+8
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #206 from johnmcdonnell/wordwrapArmin Ronacher2013-05-181-3/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Allow choice of wrap string in wordwrap filter.John McDonnell2013-05-071-3/+8
| | | | |_|/ / / / / / | | | |/| | | | | | |
* | | | | | | | | | | Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branchArmin Ronacher2013-05-182-26/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Python 2.6+ supports conditional expressions.Cory Benfield2013-05-181-24/+7
| * | | | | | | | | | | BytesIO from six.Cory Benfield2013-05-181-2/+1
* | | | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-181-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Whitespace cleanupArmin Ronacher2013-05-181-3/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-182-1/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Cleanup and changelog entry for new contextfunction behaviorArmin Ronacher2013-05-181-5/+5
| * | | | | | | | | - Allow callable classes to have contextfunction and the likeRichard Eames2013-04-151-0/+11
| * | | | | | | | | - TestcaseRichard Eames2013-04-151-1/+13
| |/ / / / / / / /
* | | | | | | | | Remove unused importsDaniel Neuhäuser2013-05-1810-13/+8
* | | | | | | | | Merge pull request #214 from Lukasa/luk-sprint-branchArmin Ronacher2013-05-182-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't assign the range type each time.Cory Benfield2013-05-181-4/+6
| * | | | | | | | | Correctly compare version type.Cory Benfield2013-05-181-1/+1
* | | | | | | | | | Make dump() work Python 3.3Armin Ronacher2013-05-181-1/+1
* | | | | | | | | | file -> open for 3.x support. This fixes #152Armin Ronacher2013-05-181-1/+1
* | | | | | | | | | Cleanup up some importsArmin Ronacher2013-05-181-2/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #213 from Lukasa/luk-sprint-branchArmin Ronacher2013-05-185-10/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | No need for tuple comparisons.Cory Benfield2013-05-184-4/+4
| * | | | | | | | We don't support 2.4 anymore.Cory Benfield2013-05-181-6/+5
* | | | | | | | | Fixed a check that broke pypyArmin Ronacher2013-05-181-1/+5
|/ / / / / / / /
* | | | | | | | A bit of cleanup in the environmentArmin Ronacher2013-05-181-2/+6
* | | | | | | | Trash debugsupport.Cory Benfield2013-05-182-84/+3
* | | | | | | | utils: remove some old py compat codeThomas Waldmann2013-05-181-44/+3
* | | | | | | | _markupsafe: remove some py2.4/2.5 compat codeThomas Waldmann2013-05-181-9/+1
* | | | | | | | python 3 port: manual fixes, remove 2to3 from setup.py, remove fixersThomas Waldmann2013-05-1823-214/+234
* | | | | | | | python 3 port: automated changes by a slightly modified python-modernizeThomas Waldmann2013-05-1729-131/+171
|/ / / / / / /
* | | | | | | Pessimistic locking for LRU cache. This fixes #8Armin Ronacher2013-04-131-20/+24
* | | | | | | Merge pull request #193 from mozillazg/patch-1Armin Ronacher2013-04-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed an issue about urlize functionmozillazg2013-03-181-0/+1
| |/ / / / / /
* | | | | | | Correct typo in dictsort filter documentationTim Vergenz2013-03-281-1/+1
|/ / / / / /
* | | | | | Fixed an unicode error after 2to3Armin Ronacher2012-09-161-1/+1
* | | | | | Added filesize part to the module compiler. This fixes #131 for 3.3 and laterArmin Ronacher2012-09-161-0/+4
| |/ / / / |/| | | |
* | | | | Fix typos.Christoph Zwerschke2012-03-131-1/+1
* | | | | Fix to #93, this time respecting whitespaceNed Jackson Lovely2012-03-122-1/+16
* | | | | Merge pull request #78 from SimonSapin/patch-2Ron DuPlain2012-03-091-1/+1
|\ \ \ \ \
| * | | | | Typo fixSimon Sapin2011-12-031-1/+1
| | |/ / / | |/| | |