summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-10-17fix documentation for csrf checkingMichael Merickel
2013-10-17Merge pull request #1168 from jthemphill/patch-1Tres Seaver
2013-10-16Add HTML escaping to views.pyJeff Hemphill
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
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
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
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
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
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
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 request.session.check_...Karl O. Pinc
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 s...Karl O. Pinc
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
2013-10-07- use clearer subjectSteve Piercy
2013-10-07Merge branch 'kpinc-doc_interactive_dev'Steve Piercy
2013-10-07wrap to 79Steve Piercy
2013-10-07Merge branch 'doc_interactive_dev' of github.com:kpinc/pyramid into kpinc-doc...Steve Piercy
2013-10-07- straighten out difference between content and its presentation, re: admonit...Steve Piercy
2013-10-07- Merge branch 'docs_dict_note' of github.com:kpinc/pyramid into kpinc-docs_d...Steve Piercy
2013-10-07Docs: introduction.rst: Note that printf() works.Karl O. Pinc
2013-10-07Merge branch 'master' into doc_interactive_devKarl O. Pinc
2013-10-07Merge branch 'doc_interactive_dev' of github.com:kpinc/pyramid into kpinc-doc...Steve Piercy
2013-10-07Merge branch 'doc_reload_template_note' of github.com:kpinc/pyramid into kpin...Steve Piercy
2013-10-07Merge branch 'doc_render_to_response2' of github.com:kpinc/pyramid into kpinc...Steve Piercy
2013-10-07Docs: project.rst: Reword template reload note per Steve Piercy's suggestions.Karl O. Pinc
2013-10-07fix some broken positional args to sqlalchemy modelsMichael Merickel
2013-10-07Docs: renders.rst: Make sentences that everybody's happy with.Karl O. Pinc
2013-10-07Docs: renders.rst: Make sentences short per IRC chat with committers.Karl O. Pinc