summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-19update changelogMichael Merickel
2013-10-19attempt to decode basic header as utf-8 and fallback to latin-1Michael Merickel
fixes #898 fixes #904
2013-10-19Merge branch 'master' of Cuidightheach/pyramid into ↵Michael Merickel
fix.basic-authentication-encodings
2013-10-19Merge branch 'master' into feature.signed-cookie-sessionMichael Merickel
2013-10-19reference github issuesMichael Merickel
2013-10-19update doc referencesMichael Merickel
2013-10-19move HTTPBadCSRFToken to p.exceptions.BadCSRFTokenMichael Merickel
2013-10-19Merge branch 'check_csrf_token' of kpinc/pyramid into ↵Michael Merickel
feature.bad-csrf-token-exception
2013-10-19update the docsMichael Merickel
2013-10-19updated changelogMichael Merickel
2013-10-19fix tests on python 3Michael Merickel
2013-10-19add deprecation for old cookie factoryMichael Merickel
2013-10-19update session to use a static salt and separate serialize funcsMichael Merickel
2013-10-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-17fix documentation for csrf checkingMichael Merickel
2013-10-17Merge pull request #1168 from jthemphill/patch-1Tres Seaver
Add HTML escaping to views.py in the wiki2 tutorial
2013-10-16Add HTML escaping to views.pyJeff Hemphill
At least it's less obviously dangerous this way.
2013-10-14update old ptweens outputMichael Merickel
2013-10-14Address #866; don't run the tests when the docs build, this means that 'make ↵Chris McDonough
html' must be run using a SPHINXBUILD=/path/to/virtualenv/with/pyramid
2013-10-14temporarily dont run tests to see impact on readthedocsChris McDonough
2013-10-14make these tests pass on python 3.2+Chris McDonough
2013-10-14Revert "make these tests pass on python 3.2+"Chris McDonough
This reverts commit cd218d2934c87260bbb10620e3b419b275fe6244.
2013-10-14make these tests pass on python 3.2+Chris McDonough
2013-10-14add note about custom args to python when using command-line scriptsChris McDonough
2013-10-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-11Merge pull request #1157 from tshepang/diffMichael Merickel
some doc fixes/improvements
2013-10-11docs: typosTshepang Lekhonkhobe
2013-10-11docs: capitaliseTshepang Lekhonkhobe
2013-10-11docs: rm redundancyTshepang Lekhonkhobe
2013-10-09Merge pull request #1152 from Pylons/feature.run-scripts-directlyChris McDonough
run console scripts directly
2013-10-09Merge remote-tracking branch 'origin/master'Paul Everitt
2013-10-09Hedge a little while the compendium of session add-ons is written.Paul Everitt
2013-10-09update changelogMichael Merickel
2013-10-09add the ability to run the scripts using "python -m"Michael Merickel
for example:: env/bin/python -3 -m pyramid.scripts.pserve development.ini
2013-10-08fix stupid missing named arguments, whyyyMichael Merickel
2013-10-08Merge branch 'origin/master'Steve Piercy
2013-10-08grammar polishSteve Piercy
2013-10-08Merge pull request #1148 from kpinc/docs_nobeakerSteve Piercy
Docs: introduction.rst: Beaker -> Redis.
2013-10-08Small quick tutorial fixes post conference.Paul Everitt
2013-10-08Merge branch 'origin/master'Steve Piercy
2013-10-08print() not printf()Steve Piercy
2013-10-08Subclass HTTPBadCSRFToken from HTTPBadRequest and have ↵Karl O. Pinc
request.session.check_csrf_token use the new exception. This supports a more fine-grained exception trapping.
2013-10-08Docs: introduction.rst: Beaker -> Redis.Karl O. Pinc
2013-10-08Docs: project.rst: Oops, print(), not printf().Karl O. Pinc
2013-10-08Docs: project.rst: Printf()s can be used for debugging. Output goes to the ↵Karl O. Pinc
server console. The main point of the second sentence is to setup the reader with mental context for the 3rd sentence, so that the 3rd sentence sinks in. Likewise, the parenthetical in the second sentence about server startup messages gives the reader some clue as to what the rest of the sentence it talking about. I suspect that some readers won't know what a console is, and the rest will be confused by a server run on a console.
2013-10-08remove unused renderer argChris McDonough
2013-10-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-08- remove . from end of URLSteve Piercy
2013-10-08Merge branch 'conf' of github.com:tshepang/pyramid into tshepang-conf.Steve Piercy