summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-04-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-30Merge pull request #1622 from stevepiercy/masterSteve Piercy
2015-03-30remove italics from internal referencesSteve Piercy
2015-03-26fix out of date match_param docsMichael Merickel
2015-03-25Merge pull request #1619 from stevepiercy/masterSteve Piercy
2015-03-25Add a badge and link for latest documentation to complement masterSteve Piercy
2015-03-21Merge pull request #1615 from stevepiercy/masterSteve Piercy
2015-03-21update pylons sphinx theme on master branch, tooSteve Piercy
2015-03-15be more specific about the append_slash feature additionChris McDonough
2015-03-15Merge branch 'dstufft-custom-append-slash-redirect'Chris McDonough
2015-03-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-15add docs to notfound_view_config decorator code, expand docs to inlcude an e...Chris McDonough
2015-03-15Merge branch 'custom-append-slash-redirect' of https://github.com/dstufft/pyr...Chris McDonough
2015-03-15Add myself to CONTRIBUTORS.txtDonald Stufft
2015-03-15Allow passing a custom redirect class for appending slashesDonald Stufft
2015-03-13Merge pull request #1607 from ledmonster/fix-forbidden_view_config-commentTres Seaver
2015-03-13fix comment in forbidden_view_configJunya Hayashi
2015-03-13Update code exampleSteve Piercy
2015-03-11fix merge conflicts after merging master to fix.view-lookup branch; do the me...Chris McDonough
2015-03-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-06Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8John Anderson
2015-03-05Merge pull request #1471 from Pylons/feature.py3-coverageMichael Merickel
2015-03-05Merge pull request #1575 from Pylons/fix.shared-view-rendererMichael Merickel
2015-03-05add clone to the IRendererInfo interfaceMichael Merickel
2015-03-05Merge branch 'master' into fix.shared-view-rendererMichael Merickel
2015-02-24Merge pull request #1592 from davisagli/fix.reloader-non-ttyMichael Merickel
2015-02-24update changelogDavid Glick
2015-02-24only reset terminal echo flag if stdin is a ttyDavid Glick
2015-02-22remove tuple creation from inner loopMichael Merickel
2015-02-22ignore new .eggs folder created by "setup.py test" depsMichael Merickel
2015-02-22Merge pull request #1563 from Pylons/fix.idempotent-render-to-responseMichael Merickel
2015-02-20dump xunit for py2/py3 targetsMichael Merickel
2015-02-20split out targets for py2-cover and py3-cover and add docs buildingMichael Merickel
2015-02-20Merge branch 'master' into feature.py3-coverageMichael Merickel
2015-02-19Merge pull request #1587 from msabramo/fix_asset_override_with_packageMichael Merickel
2015-02-19Fix asset override with packageMarc Abramowitz
2015-02-19Enhance test_assets to expose #1580Marc Abramowitz
2015-02-17pserve -b will always open 127.0.0.1Michael Merickel
2015-02-17enhance security docs with an example of subclassing a builtin policyMichael Merickel
2015-02-17grammarMichael Merickel
2015-02-17Merge branch 'pull.1483'Michael Merickel
2015-02-17reword a small part to clarify what's happening with view_configMichael Merickel
2015-02-17Merge branch 'fix.600' of zmarvel/pyramid into pull.1483Michael Merickel
2015-02-17fix typo on changes.rstMichael Merickel
2015-02-17Merge branch 'feature.re-entrant-config'Chris McDonough
2015-02-17appease coverageChris McDonough
2015-02-17dammit, forgot to revert importMichael Merickel
2015-02-17add functest for config reentrancyChris McDonough
2015-02-17fix syntaxMichael Merickel
2015-02-17avoid saying order=0, instead say PHASE3_CONFIGMichael Merickel