summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Pytest Initial CommitKartheek Lenkala2015-03-221-1/+0
| | | |
| * | | Pytest migration initial commitKartheek Lenkala2015-03-2222-993/+936
| | |/ | |/|
| * | Merge pull request #254 from yoloseem/masterMarkus Unterwaditzer2015-03-111-6/+0
| |\ \ |/ / / | | | Duplication of index and search links on main page of documentation.
| * | Remove index and search function from contents.rst.incHyunjun Kim2013-07-161-6/+0
| | |
* | | Merge branch '2.7-maintenance'Markus Unterwaditzer2015-03-110-0/+0
|\ \ \ | | |/ | |/|
| * | Import from correct location.Markus Unterwaditzer2015-03-111-1/+1
| | | | | | | | | | | | Fix #259
* | | Merge pull request #275 from yoloseem/patch-1Markus Unterwaditzer2015-03-110-0/+0
|\ \ \ | | | | | | | | Fixed typos on docstrings of template filters.
| * | | Fixed typos on docstrings of template filters.Hyunjun Kim2013-11-011-4/+4
| | | | | | | | | | | | | | | | appying -> applying
* | | | Merge pull request #343 from joernhees/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ | | | | | | | | | | Custom Filters example inserts escaped <br>s
| * | | | Custom Filters example inserts escaped <br>sJörn Hees2014-06-151-1/+1
| | | | | | | | | | | | | | | The example nl2br custom filter inserts escaped `&lt;br&gt;` <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/masterMarkus Unterwaditzer2015-03-111-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Added ".. versionadded:: 2.8" to `equalto` test
| * | | | | Added ".. versionadded:: 2.8" to test_equalto.__doc__Walter Leibbrandt2014-06-191-0/+2
| |/ / / /
* | | | | Merge pull request #345 from hszcg/patch-1Markus Unterwaditzer2015-03-110-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix missing " in docs/tricks.rst
| * | | | | Fix missing " in docs/tricks.rstChenguang Zhang2014-06-241-1/+1
| |/ / / /
* | | | | Merge branch 'adamchainz-master'Markus Unterwaditzer2015-03-111-21/+20
|\ \ \ \ \
| * | | | | Clarify sentenceMarkus Unterwaditzer2015-03-111-2/+2
| | | | | |
| * | | | | Switching docs tweaksAdam Chainz2014-07-121-21/+20
| |/ / / /
* | | | | Merge pull request #375 from zart/fix-relative-search-on-windowsMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Windows returns EINVAL on bogus filenames
| * | | | | Windows returns EINVAL on bogus filenamesKonstantin Zemlyak2014-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Related pull of pyramid_jinja2: https://github.com/Pylons/pyramid_jinja2/pull/94
* | | | | | Merge pull request #370 from BillyWM/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo "makes sense to defined" -> define
| * | | | | | fix typo "possible to defined" -> defineWilliam Wenge-Murphy2014-09-201-1/+1
| |/ / / / /
* | | | | | Merge pull request #362 from topher86/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update djangojinja2.py
| * | | | | | Update djangojinja2.pytopher862014-08-281-1/+1
| |/ / / / / | | | | | | | | | | | | Updating to reflect new default global cache size
* | | | | | Merge pull request #402 from quodlibetor/attr-filter-docstring-cleanupMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change attr filter example to match description
| * | | | | | Change attr filter example to match descriptionBrandon W Maister2015-02-051-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-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix trivial typo (side -> size)
| * | | | | | fix trivial typo (side -> size)rbtcollins2014-11-211-1/+1
| |/ / / / /
* | | | | | Merge pull request #381 from ubershmekel/patch-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | A double quote is missing
| * | | | | | A double quote is missingYuval Greenfield2014-11-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #388 from olegpesok/truncateDocFixMarkus Unterwaditzer2015-03-111-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix incorrect truncate filter docs
| * | | | | | Fix incorrect truncate filter docsOleg Pesok2014-12-101-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Examples contrary to behavior and description of killwords argument.
* | | | | | Merge pull request #403 from whit537/patch-1Markus Unterwaditzer2015-03-111-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | trim obsolete sentence re: i18n extension
| * | | | | | trim obsolete sentence re: i18n extensionChad Whitacre2015-02-051-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-1Markus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace lambda for 'dict' in with dict itself
| * | | | | | Replace lambda for 'dict' in with dict itselfPeter Harris2015-01-231-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/masterMarkus Unterwaditzer2015-03-111-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated template documentation examples
| * | | | | | Updated template documentation examplesEvan Sonderegger2015-01-071-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/masterMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo
| * | | | | | Fix typoFabio Utzig2015-01-181-1/+1
| |/ / / / /
* | | | | | Merge pull request #398 from cerivera/masterMarkus Unterwaditzer2015-03-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | grammar fix
| * | | | | | grammar fixCarlos Eduardo Rivera2015-01-181-1/+1
| |/ / / / /
* | | | | | Merge branch 'westurner-patch-1'Markus Unterwaditzer2015-03-111-268/+321
|\ \ \ \ \ \
| * | | | | | A few nitpicksMarkus Unterwaditzer2015-03-111-52/+40
| | | | | | |
| * | | | | | We don't want to give a specific recommendation.Markus Unterwaditzer2015-03-111-3/+2
| | | | | | |
| * | | | | | Not only syntax is affected.Markus Unterwaditzer2015-03-111-2/+2
| | | | | | |
| * | | | | | DOC: Update templates.rst: syntax, commasWes Turner2014-12-111-268/+334
| |/ / / / /
* | | | | | decimal is a numberTim Bray2015-03-112-2/+3
| | | | | |
* | | | | | Merge pull request #418 from toanant/patch-1Markus Unterwaditzer2015-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Typo Fixed.
| * | | | | | Typo Fixed.Abhishek Kumar Singh2015-03-071-1/+1
|/ / / / / /
* | | | | | Merge pull request #413 from hmeine/masterMarkus Unterwaditzer2015-02-261-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix copy-pasted typo in filter docstrings