Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge remote-tracking branch 'mgax/test-for-58d458d' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | unit test for dumping as utf-8 to a file | Alex Morega | 2013-05-18 | 1 | -0/+14 | |
* | | | | | | | | | Fixed a type in a module name. | Armin Ronacher | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | | Merge remote-tracking branch 'ThomasWaldmann/sprint-branch' into sprint-branch | Armin Ronacher | 2013-05-18 | 4 | -11/+30 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | stuff missing from previous commit, thanks git | Thomas Waldmann | 2013-05-18 | 2 | -6/+4 | |
| * | | | | | | | | new jinja2._compat module for stuff not yet in six 1.3.0 | Thomas Waldmann | 2013-05-18 | 3 | -4/+21 | |
* | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #188 from lemonad/master | Armin Ronacher | 2013-05-18 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fixed typos: overriden to overridden | Jonas Nockert | 2013-02-23 | 2 | -4/+4 | |
| | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Added missing versionadded and changelog entry | Armin Ronacher | 2013-05-18 | 1 | -0/+3 | |
| * | | | | | | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2 | Armin Ronacher | 2013-05-18 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #206 from johnmcdonnell/wordwrap | Armin Ronacher | 2013-05-18 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Allow choice of wrap string in wordwrap filter. | John McDonnell | 2013-05-07 | 1 | -3/+8 | |
| | | | |_|/ / / / / / | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sprint-branch' of github.com:mitsuhiko/jinja2 into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -26/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Python 2.6+ supports conditional expressions. | Cory Benfield | 2013-05-18 | 1 | -24/+7 | |
| * | | | | | | | | | | | BytesIO from six. | Cory Benfield | 2013-05-18 | 1 | -2/+1 | |
* | | | | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Whitespace cleanup | Armin Ronacher | 2013-05-18 | 1 | -3/+4 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -1/+24 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Cleanup and changelog entry for new contextfunction behavior | Armin Ronacher | 2013-05-18 | 1 | -5/+5 | |
| * | | | | | | | | | - Allow callable classes to have contextfunction and the like | Richard Eames | 2013-04-15 | 1 | -0/+11 | |
| * | | | | | | | | | - Testcase | Richard Eames | 2013-04-15 | 1 | -1/+13 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Remove unused imports | Daniel Neuhäuser | 2013-05-18 | 10 | -13/+8 | |
* | | | | | | | | | Merge pull request #214 from Lukasa/luk-sprint-branch | Armin Ronacher | 2013-05-18 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't assign the range type each time. | Cory Benfield | 2013-05-18 | 1 | -4/+6 | |
| * | | | | | | | | | Correctly compare version type. | Cory Benfield | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | | | Make dump() work Python 3.3 | Armin Ronacher | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | | | file -> open for 3.x support. This fixes #152 | Armin Ronacher | 2013-05-18 | 1 | -1/+1 | |
* | | | | | | | | | | Cleanup up some imports | Armin Ronacher | 2013-05-18 | 1 | -2/+1 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #213 from Lukasa/luk-sprint-branch | Armin Ronacher | 2013-05-18 | 5 | -10/+9 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | No need for tuple comparisons. | Cory Benfield | 2013-05-18 | 4 | -4/+4 | |
| * | | | | | | | | We don't support 2.4 anymore. | Cory Benfield | 2013-05-18 | 1 | -6/+5 | |
* | | | | | | | | | Fixed a check that broke pypy | Armin Ronacher | 2013-05-18 | 1 | -1/+5 | |
|/ / / / / / / / | ||||||
* | | | | | | | | A bit of cleanup in the environment | Armin Ronacher | 2013-05-18 | 1 | -2/+6 | |
* | | | | | | | | Trash debugsupport. | Cory Benfield | 2013-05-18 | 2 | -84/+3 | |
* | | | | | | | | utils: remove some old py compat code | Thomas Waldmann | 2013-05-18 | 1 | -44/+3 | |
* | | | | | | | | _markupsafe: remove some py2.4/2.5 compat code | Thomas Waldmann | 2013-05-18 | 1 | -9/+1 | |
* | | | | | | | | python 3 port: manual fixes, remove 2to3 from setup.py, remove fixers | Thomas Waldmann | 2013-05-18 | 23 | -214/+234 | |
* | | | | | | | | python 3 port: automated changes by a slightly modified python-modernize | Thomas Waldmann | 2013-05-17 | 29 | -131/+171 | |
|/ / / / / / / | ||||||
* | | | | | | | Pessimistic locking for LRU cache. This fixes #8 | Armin Ronacher | 2013-04-13 | 1 | -20/+24 | |
* | | | | | | | Merge pull request #193 from mozillazg/patch-1 | Armin Ronacher | 2013-04-12 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed an issue about urlize function | mozillazg | 2013-03-18 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Correct typo in dictsort filter documentation | Tim Vergenz | 2013-03-28 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Fixed an unicode error after 2to3 | Armin Ronacher | 2012-09-16 | 1 | -1/+1 | |
* | | | | | | Added filesize part to the module compiler. This fixes #131 for 3.3 and later | Armin Ronacher | 2012-09-16 | 1 | -0/+4 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Fix typos. | Christoph Zwerschke | 2012-03-13 | 1 | -1/+1 | |
* | | | | | Fix to #93, this time respecting whitespace | Ned Jackson Lovely | 2012-03-12 | 2 | -1/+16 | |
* | | | | | Merge pull request #78 from SimonSapin/patch-2 | Ron DuPlain | 2012-03-09 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Typo fix | Simon Sapin | 2011-12-03 | 1 | -1/+1 | |
| | |/ / / | |/| | | |