summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump tox from 3.15.1 to 3.15.2dependabot/pip/tox-3.15.2dependabot-preview[bot]2020-06-081-1/+1
* Merge pull request #1228 from pallets/dependabot/pip/pytest-5.4.3David Lord2020-06-032-2/+2
|\
| * Bump pytest from 5.4.2 to 5.4.3dependabot/pip/pytest-5.4.3dependabot-preview[bot]2020-06-032-2/+2
|/
* Bump pip-tools from 5.1.2 to 5.2.0 (#1227)dependabot-preview[bot]2020-05-281-1/+1
* add EditorConfigDavid Lord2020-05-231-0/+13
* Merge pull request #1225 from pallets/github-actionsDavid Lord2020-05-232-42/+52
|\
| * use GitHub Actions for CIDavid Lord2020-05-232-42/+52
|/
* Merge pull request #1224 from pallets/loader-docsDavid Lord2020-05-232-27/+42
|\
| * update package and filesystem loader docsDavid Lord2020-05-232-27/+42
* | Merge pull request #1222 from pallets/dependabot/pip/tox-3.15.1David Lord2020-05-231-1/+1
|\ \ | |/ |/|
| * Bump tox from 3.15.0 to 3.15.1dependabot-preview[bot]2020-05-231-1/+1
|/
* Merge pull request #1221 from pallets/remove-docs-devDavid Lord2020-05-233-35/+2
|\
| * remove docs requirements from dev requirmentsremove-docs-devDavid Lord2020-05-233-35/+2
|/
* try another dependabot ignore patternDavid Lord2020-05-181-1/+1
* try another dependabot ignore patternDavid Lord2020-05-181-1/+1
* fix dependabot config syntaxDavid Lord2020-05-181-1/+2
* Merge pull request #1216 from pallets/dependabot-configDavid Lord2020-05-181-0/+7
|\
| * try to make dependabot ignore editable lineDavid Lord2020-05-181-0/+7
|/
* Merge pull request #1214 from pallets/requirementsDavid Lord2020-05-1810-8/+121
|\
| * use pip-compile to pin dev requirementsDavid Lord2020-05-1810-8/+121
|/
* Merge pull request #1213 from pallets/rtd-configDavid Lord2020-05-181-0/+8
|\
| * add readthedocs configDavid Lord2020-05-181-0/+8
|/
* Merge pull request #1196 from pallets/remove-vimDavid Lord2020-04-193-202/+35
|\
| * remove vim syntax fileDavid Lord2020-04-193-202/+35
|/
* Merge branch '2.11.x'David Lord2020-04-135-33/+127
|\
| * fix changelog headerDavid Lord2020-04-131-2/+2
| * release version 2.11.22.11.2David Lord2020-04-132-2/+2
| * Merge pull request #1190 from pallets/native-evalDavid Lord2020-04-133-24/+20
| |\
| | * native only evals at end of renderDavid Lord2020-04-133-24/+20
| |/
| * Merge pull request #1183 from exponea/1138-fix-unintended-lstrip-behavior-changeDavid Lord2020-04-133-5/+102
| |\
| | * Add tests for lstrip whitespace behavior fixPeter Dolak2020-04-132-0/+94
| | * Fix unintended lstrip_blocks behavior. Fixes #1138Peter Dolak2020-04-131-5/+8
| |/
* | Don't use setlocal in syntax file (#1164)Ken Crowell2020-04-121-3/+0
* | Update oudated CutomLoader code example (#1185)Xinbin Huang2020-04-081-2/+2
* | Merge branch '2.11.x'David Lord2020-04-080-0/+0
|\ \ | |/
| * Merge tag '2.11.1' into 2.11.xDavid Lord2020-04-081-1/+1
| |\
| | * release version 2.11.12.11.1David Lord2020-01-302-2/+2
* | | Merge pull request #1169 from asottile/pep_451David Lord2020-03-303-14/+49
|\ \ \
| * | | add changelog and cleanup for pep 451 supportDavid Lord2020-03-303-20/+15
| * | | Use importlib machinery to fix PEP 451 import hooksAnthony Sottile2020-03-302-14/+54
|/ / /
* | | Merge branch '2.11.x'David Lord2020-03-305-3/+41
|\ \ \ | |/ /
| * | Merge pull request #1181 from bartfeenstra/async-namespaceDavid Lord2020-03-303-1/+15
| |\ \
| | * | namespace object works in async templatesBart Feenstra2020-03-303-1/+15
| |/ /
| * | Merge pull request #1178 from avli/fix-lexer-linenoDavid Lord2020-03-303-2/+26
| |\ \
| | * | Fix tokens line number calculation when whitespace stripping is usedAndrey Lisin2020-03-303-2/+26
| |/ /
* | | Merge branch '2.11.x'David Lord2020-03-306-15/+41
|\ \ \ | |/ /
| * | Merge pull request #1182 from pallets/revert-package-loaderDavid Lord2020-03-304-165/+53
| |\ \
| | * | changelog for reverting PackageLoader changesDavid Lord2020-03-301-0/+6
| | * | Revert "PackageLoader doesn't depend on setuptools"David Lord2020-03-303-134/+47
| | * | Revert "PackageLoader understands namespace packages"David Lord2020-03-301-39/+8
| |/ /