summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-21Fix documentation of testing.setUpRonan Amicel
2013-07-18add whatsnew-1.5Chris McDonough
2013-07-18version bump in setup.py conf.py CHANGES.txt, rejigger changes bugs vs. featuresChris McDonough
2013-07-18normalize notations used for string and json renderer return values, closes ↵Chris McDonough
#1005
2013-07-17Merge branch 'wichert-auth-parent-domain'Chris McDonough
2013-07-17Merge branch 'auth-parent-domain' of github.com:wichert/pyramid into ↵Chris McDonough
wichert-auth-parent-domain
2013-07-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-07-15update changelogMichael Merickel
2013-07-15Merge pull request #1046 from lrowe/skip-same-viewsMichael Merickel
Avoid re-executing the same view when looking up context base views.
2013-07-14Avoid re-executing the same view when looking up context base views.Laurence Rowe
This is a tweak of #1004. Really we should be using subscribers here instead of adapters, but zope.interface doesn't yet suppport named subscribers.
2013-07-14Merge branch 'pull.1004'Michael Merickel
2013-07-14update changlogMichael Merickel
2013-07-14Merge branch 'master' of lrowe/pyramid into pull.1004Michael Merickel
2013-07-13Merge pull request #1045 from stevepiercy/masterChris McDonough
New tutorial: Using PyCharm with Pyramid
2013-07-13New tutorial: Using PyCharm with PyramidSteve Piercy
2013-07-13Merge branch 'master' of github.com:stevepiercy/pyramidSteve Piercy
2013-07-13New tutorial: Using PyCharm with PyramidSteve Piercy
2013-07-13New tutorial: Using PyCharm with PyramidSteve Piercy
2013-07-12Merge pull request #1043 from merwok/masterTres Seaver
Minor markup update to clarify object type
2013-07-12Merge pull request #1044 from stevepiercy/masterMichael Merickel
Make abstraction variables consistent.
2013-07-12Make abstraction consistent.Steve Piercy
2013-07-12Merge branch 'feature.prequest_login'Chris McDonough
2013-07-12add an entry to changes about code merged from feature.prequest_login branchChris McDonough
2013-07-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-07-11Merge pull request #1041 from merwok/patch-1Tres Seaver
reST fixes
2013-07-11Coverage for new OPTIONS and PROPFIND methods.Tres Seaver
2013-07-11Coverage for new '--login' option.Tres Seaver
2013-07-11Get this out of the way after removing the pre-commit hook.Tres Seaver
2013-07-11Typo firx from merwok.Tres Seaver
2013-07-11Minor markup update to clarify object typeÉric Araujo
2013-07-11reST fixÉric Araujo
2013-07-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-07-02Allow 'prequest' to send basic auth headers.Tres Seaver
Also, allow passing PROPFIND / OPTIONS as methods.
2013-07-01Tres committed this by mistakeChris McDonough
2013-06-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-06-19TypoTres Seaver
2013-06-19Changelog for PR #1033.Tres Seaver
2013-06-19Update docstring to show PUT / PATCH usage.Tres Seaver
2013-06-19Merge branch 'master' into merwok-masterTres Seaver
2013-06-19Trailing whitespace.Tres Seaver
2013-06-19Add support for PUT and PATCH in prequest (#877)Éric Araujo
2013-06-19TriggerTres Seaver
2013-06-19Tweak.Tres Seaver
2013-06-11- ``pyramid.testing.DummyResource`` didn't define ``__bool__``, so code underChris McDonough
Python 3 would use ``__len__`` to find truthiness; this usually caused an instance of DummyResource to be "falsy" instead of "truthy". See https://github.com/Pylons/pyramid/pull/1032 Closes #1032
2013-06-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-06-06Merge pull request #1031 from omh/masterChris McDonough
Resources.rst typo fix
2013-06-06Resources.rst quick typo fixOle Morten Halvorsen
There's 3 keys in the info dict, not two.
2013-06-05Merge branch 'lukecyca-master'Chris McDonough
2013-06-05add changelog noteChris McDonough
2013-06-05Merge branch 'master' of github.com:lukecyca/pyramid into lukecyca-masterChris McDonough