summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-10update changelog with new http exceptions from #1372Michael Merickel
2014-11-10Merge pull request #1372 from marinewater/feature.httpexceptionsMichael Merickel
2014-11-10Merge branch 'feature.generic-log-formatter'Michael Merickel
2014-11-10update changelogMichael Merickel
2014-11-10continue #1326 by adding line numbers to development.iniMichael Merickel
2014-11-10Merge pull request #1326 from geonetix/linenumberlogsMichael Merickel
2014-11-09update changelog for #1373Michael Merickel
2014-11-09Merge pull request #1373 from dobesv/patch-5Michael Merickel
2014-11-09update changelog from #1376Michael Merickel
2014-11-09Merge pull request #1376 from invisibleroads/patch-3Michael Merickel
2014-11-09Merge pull request #1442 from stevepiercy/masterSteve Piercy
2014-11-09- add missing "has"Steve Piercy
2014-11-09- rewrapSteve Piercy
2014-11-09Merge pull request #1438 from stevepiercy/masterSteve Piercy
2014-11-09- add Translation Context term to Glossary to allow Sphinx to build docs, in ...Steve Piercy
2014-11-07Merge pull request #1437 from bertjwregeer/update.exceptionsTres Seaver
2014-11-06Update documentation for exceptionsBert JW Regeer
2014-11-04fix squashed docstring on set_request_propertyMichael Merickel
2014-10-20Merge pull request #1337 from Pylons/feature.root-packageTres Seaver
2014-10-20reference more pull requests in the change logMichael Merickel
2014-10-20add config.root_package attributeMichael Merickel
2014-10-14Merge branch 'pull.1430'Michael Merickel
2014-10-14fix comment on hello viewMichael Merickel
2014-10-14Merge pull request #1429 from jaymartin7/patch-2Michael Merickel
2014-10-14typo fixJay Martin
2014-10-14Merge pull request #1429 from jaymartin7/patch-2Michael Merickel
2014-10-14fix route name in commentsJay Martin
2014-10-14typo fixJay Martin
2014-10-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-10-08Merge pull request #1425 from deisner/masterChris McDonough
2014-10-08Minor edits to Templating With jinja2David Eisner
2014-10-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-10-07Merge pull request #1424 from stevepiercy/masterSteve Piercy
2014-10-07Update functional_testing.rstDavid Eisner
2014-10-07Update functional_testing.rstdeisner
2014-09-29Merge pull request #1396 from kpinc/doc_configMichael Merickel
2014-09-29Merge pull request #1395 from kpinc/doc_loggingMichael Merickel
2014-09-26Merge pull request #1418 from jaymartin7/patch-1Steve Piercy
2014-09-26Update ini.rstJay Martin
2014-09-21Merge pull request #1416 from stevepiercy/masterSteve Piercy
2014-09-21Update hello_world.rstJay Martin
2014-09-21Merge pull request #1414 from stevepiercy/masterSteve Piercy
2014-09-21Correct missing word.Omid Raha
2014-09-17fix typoSteve Piercy
2014-09-10Merge pull request #1409 from bertjwregeer/patch-1Michael Merickel
2014-09-10Change helloworld to myappBert JW Regeer
2014-09-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-09-05Remove unnecessary call to get_current_registry in NullRendererHelpergoodwillcoding
2014-08-17Merge pull request #1404 from stevepiercy/masterSteve Piercy
2014-08-17- add missing step for tox setupSteve Piercy