summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-12Switch to the warnings.catch_warnings context manager for testing.Ross Patterson
FYI, this test was failing only under 2.7, not 2.6.
2012-03-11Merge branch '1.3-branch'Chris McDonough
2012-03-11- ``config.add_view(<aninstancemethod>)`` raised AttributeError involvingChris McDonough
``__text__``. See https://github.com/Pylons/pyramid/issues/461 Fixes #461.
2012-03-11Merge branch 'master' of https://github.com/hlv42/pyramid into hlv42-masterChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11Merge pull request #466 from liangsun/masterChris McDonough
To make the dummy csrf token have the same length as a real one.
2012-03-11only selfChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11view class methods were missing self parameter.Carlos de la Guardia
2012-03-09To make the dummy csrf token has the same length as a real one.Liang Sun
2012-03-08Merge pull request #463 from dbaty/patch-1Chris McDonough
Key and value are inverted in the assertion error message in "DummyTemplateRenderer.assert_()"
2012-03-06Fixed typo: key (k) and value (v) were inverted.Damien Baty
2012-03-06corrected bugfix #461 - tests explicitly for instancemethods nowhlv
testcase added
2012-03-06fixed issue #461dev
- config.add_view() raises an AttributeError for __text__ if the View is an instancemethod. added wrapper adding the __text__ attribute if it isnt present yet.
2012-03-05Merge branch '1.3-branch'Chris McDonough
2012-03-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-05Merge pull request #459 from philip-peterson/patch-1Chris McDonough
Fixed some spelling errors
2012-03-05Fixed some spelling errorsphilip-peterson
2012-03-05add_traverserChris McDonough
2012-03-04use pylons-discuss as email address in setup.py tooChris McDonough
2012-03-04point people at pylons-discuss rather than pylons-develChris McDonough
2012-03-04garden titles of indexChris McDonough
2012-03-04backslash is an escape character in RSTChris McDonough
2012-03-03untangle impacts of python 3 compatChris McDonough
2012-03-02Merge branch '1.3-branch'Chris McDonough
2012-03-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-02Merge pull request #458 from mjpieters/contributor-agreementChris McDonough
Sign the contributor agreement.
2012-03-02Merge pull request #457 from mjpieters/doccorrectionsChris McDonough
Minor correction for narrative documentation
2012-03-02Correct section name in pshell example.Martijn Pieters
The section in the example is called 'app:main', not 'app:MyProject'.
2012-03-02Sign the contributor agreement.Martijn Pieters
2012-03-02Correct minor grammatical error.Martijn Pieters
2012-03-02Merge pull request #455 from rspivak/ae6d08b96d3a366f979719c05926dc5292d904d3Chris McDonough
Finished callbacks documentation update
2012-03-02Remove some confusion about finished callbacks.Ruslan Spivak
Rework an example code and remove an incorrect statement about request.exception being set when an exception occurs in a view. The reason for the change is issue #454: https://github.com/Pylons/pyramid/issues/454
2012-03-02Merge branch '1.3-branch'Chris McDonough
2012-03-02prep for 1.3b2Chris McDonough
2012-03-02point at sqla bugChris McDonough
2012-03-01gardenChris McDonough
2012-03-01revise stepsChris McDonough
2012-03-01Merge branch '1.3-branch'Chris McDonough
2012-03-01Merge branch 'master' into 1.3-branchChris McDonough
2012-03-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-01Merge branch 'master' into 1.3-branchChris McDonough
2012-03-01wrong class name, fixes #451Chris McDonough
2012-03-01Merge pull request #453 from mjpieters/masterChris McDonough
Fixes #452: remove mention of the `root_factory` argument from the startup narrative.
2012-03-01Remove mention of the `root_factory` argument.Martijn Pieters
The example code earlier on the page does not use the `root_factory` argument, only the `settings` argument. This is a fix for pyramid issue #452.
2012-02-29fix pserve tests under windows on python 2.6Chris McDonough
2012-02-29fix pserve tests on windows 2.6Chris McDonough
2012-02-29commentChris McDonough
2012-02-29remove rantChris McDonough
2012-02-29Merge branch '1.3-branch'Chris McDonough