summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-12-09Move coverage floor pct into 'setup.cfg'.Tres Seaver
2014-12-01Merge pull request #1478 from stevepiercy/masterSteve Piercy
2014-12-01- rename pyramid_router.svg to pyramid_request_processing.svg to be consisten...Steve Piercy
2014-11-29fix build on py3.2 missing u-prefix introduced in ec5226745f8f5161f89636e036e...Michael Merickel
2014-11-27fix issue in auth_tkt parsing with the cookie type being unicodeMichael Merickel
2014-11-26Merge pull request #1475 from hugobranquinho/masterTres Seaver
2014-11-26Merge pull request #1472 from stevepiercy/masterTres Seaver
2014-11-26Merge branch 'master' of github.com:Pylons/pyramidTres Seaver
2014-11-2679 columns.Tres Seaver
2014-11-26Unused import.Tres Seaver
2014-11-26Merge pull request #1467 from mgrbyte/fix.issue1001Tres Seaver
2014-11-25Tweak seealso for the includeme function.Matt Russell
2014-11-25Include code examples for integration and functional tests in docs #1001Matt Russell
2014-11-25Documentation addedHugo Branquinho
2014-11-25Shortcut for package name on registryHugo Branquinho
2014-11-22add request processing diagram to docs/narr/router.rstSteve Piercy
2014-11-21update changelog for #1469Michael Merickel
2014-11-21Merge pull request #1469 from Pylons/testing-add-pypy3Michael Merickel
2014-11-21Add support for testing 'pypy3' under Tox / Travis.Tres Seaver
2014-11-19Merge pull request #1468 from mgrbyte/fix.hackingdotxt-glitchMichael Merickel
2014-11-19Correct url in git remote command.Matt Russell
2014-11-19Merge pull request #1466 from mgrbyte/fix.rst-requires-escaping-starstarkwMichael Merickel
2014-11-19Fixes breaking docs build due to unquoted asterisks in doc string.Matt Russell
2014-11-17Merge pull request #1399 from Pylons/feature.security-docs-enhancementsMichael Merickel
2014-11-17Merge pull request #1448 from Pylons/feature.pshell-pythonstartupMichael Merickel
2014-11-17Merge branch 'feature.override-asset-with-absolute-path'Michael Merickel
2014-11-17Merge pull request #1463 from stevepiercy/masterSteve Piercy
2014-11-17- add step for badges in README.rstSteve Piercy
2014-11-17Merge pull request #1461 from sontek/add_badgesSteve Piercy
2014-11-17Use pylonsproject.org link for docs, point to master branchJohn Anderson
2014-11-17Don't fail coverage check on systems w/ locale set.Tres Seaver
2014-11-17Use direct link to docsJohn Anderson
2014-11-17Add RTD and Travis badges in the READMEJohn Anderson
2014-11-17Merge branch 'master' into feature.override-asset-with-absolute-pathMichael Merickel
2014-11-17Merge branch 'master' into feature.pshell-pythonstartupMichael Merickel
2014-11-17Merge branch 'master' into feature.security-docs-enhancementsMichael Merickel
2014-11-17Merge pull request #1460 from sontek/fix_proutes_coverageMichael Merickel
2014-11-17Merge branch 'master' into feature.security-docs-enhancementsMichael Merickel
2014-11-16Merge branch 'master' of https://github.com/Pylons/pyramid into fix_proutes_c...John Anderson
2014-11-17fix travis.yml to use the correct TOXENV varMichael Merickel
2014-11-17note the deprecation in the todoMichael Merickel
2014-11-17Merge branch 'master' into feature.security-docs-enhancementsMichael Merickel
2014-11-16Merge branch 'master' of https://github.com/Pylons/pyramid into fix_proutes_c...John Anderson
2014-11-17reference appropriate PRMichael Merickel
2014-11-17Merge pull request #1459 from sontek/use_tox_for_travisMichael Merickel
2014-11-16Use travis_retry in case of timeouts, remove -e $OTX_ENVJohn Anderson
2014-11-17Merge pull request #1457 from Pylons/feature.string-timing-attacksMichael Merickel
2014-11-17improve the docs for absolute path overridesMichael Merickel
2014-11-16Switch to using tox for travis so coverage is ranJohn Anderson
2014-11-16Added coverage for MultiView and long names in proutesJohn Anderson