summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-01-04merge from masterChris McDonough
2012-01-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-01-04more speculative changes regarding matchingChris McDonough
2012-01-04Merge pull request #389 from bbinet/remove_python25_dependenciesMichael Merickel
2012-01-04Merge pull request #390 from larose/masterMichael Merickel
2012-01-04Removed repetition of the word "the" in the Wiki Tutorial.Mathieu Larose
2012-01-04remove dependencies related to python 2.5 in alchemy scaffoldBruno Binet
2012-01-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-01-04untested workChris McDonough
2012-01-03- The documentation of ``pyramid.events.subscriber`` indicated that using itChris McDonough
2012-01-02have sample scaffold depend on waitressChris McDonough
2012-01-02- Use the ``waitress`` WSGI server instead of ``wsgiref`` in scaffolding.Chris McDonough
2011-12-31fixed typo in contributorsBlaise Laflamme
2011-12-30gardenChris McDonough
2011-12-30Updated the changelog for Request.set_property.Michael Merickel
2011-12-30Merge branch 'feature.lazy-request-properties' into 1.3-branchMichael Merickel
2011-12-30Documented Request.set_property.Michael Merickel
2011-12-30Added the InstancePropertyMixin to the Request.Michael Merickel
2011-12-28Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branchChris McDonough
2011-12-28typoChris McDonough
2011-12-27gardenMichael Merickel
2011-12-27gardenMichael Merickel
2011-12-21Merge pull request #380 from stevepiercy/patch-10Michael Merickel
2011-12-21Split long run-on sentence into two. Steve Piercy
2011-12-21prep for 1.3a3Chris McDonough
2011-12-21merge master to 1.3 branchChris McDonough
2011-12-21- Add undocumented ``__discriminator__`` API to derived view callables.Chris McDonough
2011-12-18gardenChris McDonough
2011-12-17gardenChris McDonough
2011-12-17whitespaceChris McDonough
2011-12-16justify wsgiref usageChris McDonough
2011-12-16have output description match realityChris McDonough
2011-12-16stamp out paste.httpserver usageChris McDonough
2011-12-16- Removed the "Running Pyramid on Google App Engine" tutorial from the mainChris McDonough
2011-12-16gardenChris McDonough
2011-12-16- Allow prequest path to have query string variables.Chris McDonough
2011-12-15undo cutnpaste mistakesChris McDonough
2011-12-15Merge branch '1.3-branch'Chris McDonough
2011-12-15- Added a section named "Making Your Script into a Console Script" in theChris McDonough
2011-12-15fix importChris McDonough
2011-12-15- Normalized exit values and ``-h`` output for all ``p*`` scriptsChris McDonough
2011-12-15Merge branch 'feature.prequest' into 1.3-branchChris McDonough
2011-12-15finish prequest featureChris McDonough
2011-12-15we now use wsgiref which prints nothingChris McDonough
2011-12-15Merge branch 'master' into 1.3-branchChris McDonough
2011-12-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-12-15add prequest script and entry pointChris McDonough
2011-12-15Merge pull request #376 from jinty/masterChris McDonough
2011-12-15Fix typo in log messageBrian Sutherland
2011-12-14mention backports and fix incorrect info about being able to use paster creat...Chris McDonough