summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-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
2015-02-17fix odd sentenceMichael Merickel
2015-02-17expose public config phases in pyramid.configMichael Merickel
2015-02-17fix merge conflictsChris McDonough
2015-02-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-02-17Merge pull request #1583 from Pylons/fix.remove-cachebust-tokensMichael Merickel
2015-02-17update changelogMichael Merickel
2015-02-17use super with mixins... for reasonsMichael Merickel
2015-02-17remove the token from the ICacheBuster apiMichael Merickel
2015-02-16Merge pull request #1581 from Pylons/feature.unittest-request-methodsMichael Merickel
2015-02-16docstring on apply_propertiesMichael Merickel
2015-02-16update changelog for #1581Michael Merickel
2015-02-16add InstancePropertyHelper and apply_request_extensionsMichael Merickel
2015-02-13Merge pull request #1578 from davisagli/fix.docsMichael Merickel
2015-02-13Merge pull request #1577 from davisagli/fix.reloader-pdb-echoMichael Merickel
2015-02-13add pull request referenceDavid Glick
2015-02-12fix instructions for running coverage via toxDavid Glick
2015-02-12remove obsolete note about raise_keyboard_interrupt that's left over from pasteDavid Glick
2015-02-12Add workaround to make sure echo is enabled after reload (refs #689)David Glick
2015-02-11Merge branch 'master' into feature.py3-coverageMichael Merickel
2015-02-11fix up tests to generate coverage reports always and combine at the endMichael Merickel
2015-02-11Merge pull request #1576 from sontek/fix_toxMichael Merickel