summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
remove the token from the ICacheBuster api
2015-02-17update changelogMichael Merickel
2015-02-17use super with mixins... for reasonsMichael Merickel
2015-02-17remove the token from the ICacheBuster apiMichael Merickel
This exposes the QueryStringCacheBuster and PathSegmentCacheBuster public APIs alongside the md5-variants. These should be more cleanly subclassed by people wishing to extend their implementations.
2015-02-16Merge pull request #1581 from Pylons/feature.unittest-request-methodsMichael Merickel
add InstancePropertyHelper and apply_request_extensions
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
Fix a couple minor documentation issues
2015-02-13Merge pull request #1577 from davisagli/fix.reloader-pdb-echoMichael Merickel
Add workaround to make sure echo is enabled after reload
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
Also add myself to CONTRIBUTORS.txt
2015-02-11Merge pull request #1576 from sontek/fix_toxMichael Merickel
Don't create sdist with tox (latest setuptools doesn't like mixing)
2015-02-10Don't create sdist with tox (latest setuptools doesn't like mixing)John Anderson
2015-02-10update changelog for #1574Michael Merickel
2015-02-10Merge pull request #1574 from dstufft/patch-1Michael Merickel
Prevent timing attacks when checking CSRF token
2015-02-10Default to an empty string instead of NoneDonald Stufft
2015-02-10Prevent timing attacks when checking CSRF tokenDonald Stufft
2015-02-07Merge pull request #1498 from sontek/allow_class_method_directlyMichael Merickel
Alert the user if they are using an unbound class methods to `add_view`
2015-02-07Merge pull request #1520 from sontek/catch_bad_request_method_nameMichael Merickel
Catch bad `name` and raise a `ValueError`
2015-02-07Fix py32 supportJohn Anderson
2015-02-07Remove `native_` import, not used anymoreJohn Anderson
2015-02-07Raise error at configuration timeJohn Anderson
2015-02-07Merge branch 'master' of https://github.com/Pylons/pyramid into ↵John Anderson
allow_class_method_directly Conflicts: pyramid/compat.py
2015-02-07Merge branch 'master' of https://github.com/Pylons/pyramid into ↵John Anderson
catch_bad_request_method_name
2015-02-07Merge pull request #1566 from bertjwregeer/feature/pcreate-helpMichael Merickel
When running pcreate without scaffold, list scaffolds
2015-02-07Add test for no scaffold no project nameBert JW Regeer
This test at least makes sure that if there is no scaffold and no project name that the command exists with error 2
2015-02-07Use hammer to fix holeBert JW Regeer
2015-02-07Merge branch 'fix.response-factory-docs'Michael Merickel
2015-02-07move the IResponseFactory into the public apiMichael Merickel
2015-02-07Merge branch 'docs/response_factory' of bertjwregeer/pyramid into ↵Michael Merickel
fix.response-factory-docs
2015-02-07Fix failing testBert JW Regeer
2015-02-07Document the factory requires a positional argumentBert JW Regeer
2015-02-07Show help if missing argumentsBert JW Regeer
This will print the full help, followed by the available scaffolds if the user just calls pcreate without any arguments/flags at all.
2015-02-07Update usage line to show required -sBert JW Regeer
2015-02-07Add changelog entryBert JW Regeer
2015-02-07When running pcreate without scaffold, list scaffoldsBert JW Regeer
This fixes #1297
2015-02-06update changelog for #1541Michael Merickel
2015-02-06Merge pull request #1541 from dairiki/bug.load-arg-deprecatedMichael Merickel
Prevent DeprecationWarning from setuptools>=11.3
2015-02-06Sign CONTRIBUTORS.txtJeff Dairiki