Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Pytest Initial Commit | Kartheek Lenkala | 2015-03-22 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Pytest migration initial commit | Kartheek Lenkala | 2015-03-22 | 22 | -993/+936 | |
| | |/ | |/| | ||||||
| * | | Merge pull request #254 from yoloseem/master | Markus Unterwaditzer | 2015-03-11 | 1 | -6/+0 | |
| |\ \ |/ / / | | | | Duplication of index and search links on main page of documentation. | |||||
| * | | Remove index and search function from contents.rst.inc | Hyunjun Kim | 2013-07-16 | 1 | -6/+0 | |
| | | | ||||||
* | | | Merge branch '2.7-maintenance' | Markus Unterwaditzer | 2015-03-11 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Import from correct location. | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | Fix #259 | |||||
* | | | Merge pull request #275 from yoloseem/patch-1 | Markus Unterwaditzer | 2015-03-11 | 0 | -0/+0 | |
|\ \ \ | | | | | | | | | Fixed typos on docstrings of template filters. | |||||
| * | | | Fixed typos on docstrings of template filters. | Hyunjun Kim | 2013-11-01 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | appying -> applying | |||||
* | | | | Merge pull request #343 from joernhees/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Custom Filters example inserts escaped <br>s | |||||
| * | | | | Custom Filters example inserts escaped <br>s | Jörn Hees | 2014-06-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | The example nl2br custom filter inserts escaped `<br>` <br> tags as a `Markup.replace` method seems to be aware of modifications and pass `str`/`unicode` arguments through `escape`. | |||||
* | | | | | Merge pull request #344 from walterl/master | Markus Unterwaditzer | 2015-03-11 | 1 | -0/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added ".. versionadded:: 2.8" to `equalto` test | |||||
| * | | | | | Added ".. versionadded:: 2.8" to test_equalto.__doc__ | Walter Leibbrandt | 2014-06-19 | 1 | -0/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #345 from hszcg/patch-1 | Markus Unterwaditzer | 2015-03-11 | 0 | -0/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix missing " in docs/tricks.rst | |||||
| * | | | | | Fix missing " in docs/tricks.rst | Chenguang Zhang | 2014-06-24 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'adamchainz-master' | Markus Unterwaditzer | 2015-03-11 | 1 | -21/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clarify sentence | Markus Unterwaditzer | 2015-03-11 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Switching docs tweaks | Adam Chainz | 2014-07-12 | 1 | -21/+20 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #375 from zart/fix-relative-search-on-windows | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Windows returns EINVAL on bogus filenames | |||||
| * | | | | | Windows returns EINVAL on bogus filenames | Konstantin Zemlyak | 2014-09-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Related pull of pyramid_jinja2: https://github.com/Pylons/pyramid_jinja2/pull/94 | |||||
* | | | | | | Merge pull request #370 from BillyWM/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix typo "makes sense to defined" -> define | |||||
| * | | | | | | fix typo "possible to defined" -> define | William Wenge-Murphy | 2014-09-20 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #362 from topher86/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update djangojinja2.py | |||||
| * | | | | | | Update djangojinja2.py | topher86 | 2014-08-28 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | Updating to reflect new default global cache size | |||||
* | | | | | | Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanup | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Change attr filter example to match description | |||||
| * | | | | | | Change attr filter example to match description | Brandon W Maister | 2015-02-05 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | foo["bar"] is an item lookup, so saying that items are not looked up with that as an example is confusing. | |||||
* | | | | | | Merge pull request #383 from rbtcollins/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix trivial typo (side -> size) | |||||
| * | | | | | | fix trivial typo (side -> size) | rbtcollins | 2014-11-21 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #381 from ubershmekel/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | A double quote is missing | |||||
| * | | | | | | A double quote is missing | Yuval Greenfield | 2014-11-06 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #388 from olegpesok/truncateDocFix | Markus Unterwaditzer | 2015-03-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix incorrect truncate filter docs | |||||
| * | | | | | | Fix incorrect truncate filter docs | Oleg Pesok | 2014-12-10 | 1 | -2/+2 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Examples contrary to behavior and description of killwords argument. | |||||
* | | | | | | Merge pull request #403 from whit537/patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -4/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | trim obsolete sentence re: i18n extension | |||||
| * | | | | | | trim obsolete sentence re: i18n extension | Chad Whitacre | 2015-02-05 | 1 | -4/+3 | |
| |/ / / / / | | | | | | | | | | | | | This sentence seems like a leftover from when i18n was the only extension available, eh? | |||||
* | | | | | | Merge pull request #400 from scavpy/scavpy-patch-1 | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Replace lambda for 'dict' in with dict itself | |||||
| * | | | | | | Replace lambda for 'dict' in with dict itself | Peter Harris | 2015-01-23 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lambda **kw: kw is not equivalent to the dict constructor. It is much less useful. In particular it doesn't accept a sequence of pairs. Why not put dict itself into the DEFAULT_NAMESPACE? Principle of least surprise, etc. | |||||
* | | | | | | Merge pull request #395 from esonderegger/master | Markus Unterwaditzer | 2015-03-11 | 1 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updated template documentation examples | |||||
| * | | | | | | Updated template documentation examples | Evan Sonderegger | 2015-01-07 | 1 | -3/+3 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed html tags in base template example. Since I was removing the xmlns="http://www.w3.org/1999/xhtml" tag, it seemed like a good time to update the examples to the html5 doctype. | |||||
* | | | | | | Merge pull request #397 from utzig/master | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix typo | |||||
| * | | | | | | Fix typo | Fabio Utzig | 2015-01-18 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #398 from cerivera/master | Markus Unterwaditzer | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | grammar fix | |||||
| * | | | | | | grammar fix | Carlos Eduardo Rivera | 2015-01-18 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'westurner-patch-1' | Markus Unterwaditzer | 2015-03-11 | 1 | -268/+321 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | A few nitpicks | Markus Unterwaditzer | 2015-03-11 | 1 | -52/+40 | |
| | | | | | | | ||||||
| * | | | | | | We don't want to give a specific recommendation. | Markus Unterwaditzer | 2015-03-11 | 1 | -3/+2 | |
| | | | | | | | ||||||
| * | | | | | | Not only syntax is affected. | Markus Unterwaditzer | 2015-03-11 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | DOC: Update templates.rst: syntax, commas | Wes Turner | 2014-12-11 | 1 | -268/+334 | |
| |/ / / / / | ||||||
* | | | | | | decimal is a number | Tim Bray | 2015-03-11 | 2 | -2/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #418 from toanant/patch-1 | Markus Unterwaditzer | 2015-03-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Typo Fixed. | |||||
| * | | | | | | Typo Fixed. | Abhishek Kumar Singh | 2015-03-07 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #413 from hmeine/master | Markus Unterwaditzer | 2015-02-26 | 1 | -4/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix copy-pasted typo in filter docstrings |