summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2014-11-17Merge pull request #1458 from sontek/fail_coverage_under_hundredMichael Merickel
2014-11-16Make sure tox fails the cover build if it isn't at 100%John Anderson
2014-11-16attempt to clarify the benefit of these changesMichael Merickel
2014-11-16use hmac.compare_digest if availableMichael Merickel
2014-11-13Merge pull request #1377 from tilgovi/package-root-static-view-specMichael Merickel
2014-11-13update changelog for fixes from #1453Michael Merickel
2014-11-13Merge pull request #1453 from sontek/prettify_proutes_without_request_methodMichael Merickel
2014-11-13Remove duplicate codeChristophe de Vienne
2014-11-11adjust tests to work even when someone has defined PYTHONSTARTUP in their shellMichael Merickel
2014-11-11Format proutes output and include module instead of repr of viewJohn Anderson
2014-11-11Merge pull request #1451 from stevepiercy/masterSteve Piercy
2014-11-11fix grammarSteve Piercy
2014-11-11Add myself to contributorsRandall Leeds
2014-11-11Fix static views with package root spec patternsRandall Leeds
2014-11-11add failing test for package root spec static viewRandall Leeds
2014-11-11enable PYTHONSTARTUP support in pshellMichael Merickel
2014-11-11update changelogMichael Merickel
2014-11-11Merge pull request #1447 from iElectric/add_notfound_view/default_exceptionre...Michael Merickel
2014-11-11update changelogMichael Merickel
2014-11-11Merge pull request #1446 from iElectric/guess_mimtype_test_fixMichael Merickel