summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-12-26improve error output a bitMichael Merickel
2014-12-26optimize the conflict resolution to occur against only executed actionsMichael Merickel
2014-12-26refactor loop to combine conflict resolution paths into oneMichael Merickel
2014-12-26izip_longest is not valid on py3Michael Merickel
2014-12-26first cut at a re-entrant configurator where tests still passMichael Merickel
2014-12-26Merge pull request #1502 from stevepiercy/masterSteve Piercy
2014-12-26- pin Sphinx >= 1.2.3 for RTDSteve Piercy
2014-12-26Merge pull request #1501 from stevepiercy/masterSteve Piercy
2014-12-26- establish minimum version of 1.2.3 for Sphinx. I hope this works. See https...Steve Piercy
2014-12-26Merge pull request #1500 from stevepiercy/masterSteve Piercy
2014-12-26- adding back .png file because PDF cannot include and build SVG files. Also ...Steve Piercy
2014-12-23Merge pull request #1496 from stevepiercy/masterSteve Piercy
2014-12-23- add an index to the API directory for better SEOSteve Piercy
2014-12-23Merge pull request #1479 from stevepiercy/masterSteve Piercy
2014-12-23- remove pyramid_router.png because an .svg version is available per @tseaverSteve Piercy
2014-12-18Speed up Travis start via 'sudo: false'.Tres Seaver
2014-12-16Merge branch 'AdrianTeng-master'Chris McDonough
2014-12-1679 colsChris McDonough
2014-12-16repoze who docs movedChris McDonough
2014-12-16Merge branch 'master' of https://github.com/AdrianTeng/pyramid into AdrianTen...Chris McDonough
2014-12-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-12-17Add documentation on handling CORS pre-flightsAdrian Teng
2014-12-09Move coverage floor pct into 'setup.cfg'.Tres Seaver
2014-12-01replace router.png with pyramid_router.svg and make design consistentSteve Piercy
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