summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-06-11- ``pyramid.testing.DummyResource`` didn't define ``__bool__``, so code underChris McDonough
2013-06-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-06-06Merge pull request #1031 from omh/masterChris McDonough
2013-06-06Resources.rst quick typo fixOle Morten Halvorsen
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
2013-06-04Update tests to use X-CSRF-Token headerLuke Cyca
2013-06-04Add examples to narrative CSRF docsLuke Cyca
2013-06-02Edited narrative docs about CSRFLuke Cyca
2013-06-02Changed header name to X-CSRF-TokenLuke Cyca
2013-06-01unused importChris McDonough
2013-06-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-05-30Added myself to contributorsLuke Cyca
2013-05-30Support CSRF via X-CSRFToken HeaderLuke Cyca
2013-05-25Merge pull request #1026 from gjhiggins/masterTres Seaver
2013-05-25Update URLGraham Higgins
2013-05-22Merge pull request #1024 from vstojkovic/defer_chameleon_importTres Seaver
2013-05-22Defer imports of Chameleon until needed. Fixes #1021.Vojislav Stojkovic
2013-05-21normalize exception messages, coverageChris McDonough
2013-05-21override all known attrs and methods instead of allowing subclass to override...Chris McDonough
2013-05-21this is actually a bugfixChris McDonough
2013-05-21Merge branch 'feature-pep302'Chris McDonough
2013-05-21Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-05-21tortured docsChris McDonough
2013-05-21skip mako-related tests on py32Chris McDonough
2013-05-21Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-05-21Merge pull request #1023 from Pylons/defend_against_mako_unimportableChris McDonough
2013-05-21Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-05-21Prevent non-3.2-compatible MarkupSafe 0.16 from breaking us.Tres Seaver
2013-05-16Merge pull request #1018 from goodwillcoding/mastergoodwillcoding
2013-05-16fix indentaion typeGoodwill Coding
2013-05-16Extend informational message to pcreate output. Tutorial, docs, twitter, mail...Goodwill Coding
2013-05-11Merge pull request #1016 from tshepang/patch-1Tres Seaver
2013-05-11add missing word; be more preciseTshepang Lekhonkhobe
2013-05-09Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-05-09Implement PEP302 API in PackageOverrides as '__loader__'.Tres Seaver
2013-05-09Ignore coverage in new location.Tres Seaver
2013-05-06Merge pull request #1006 from tshepang/diffTres Seaver
2013-05-03Merge pull request #1009 from sontek/make_docs_riskyBlaise Laflamme
2013-05-03docs should be risky in master!John Anderson
2013-04-28use a cross-ref instead of a raw linkTshepang Lekhonkhobe
2013-04-24update changes.txtMichael Merickel
2013-04-23Merge pull request #1003 from tshepang/diffMichael Merickel
2013-04-23replace deprecated methodTshepang Lekhonkhobe
2013-04-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-23Merge pull request #1002 from tshepang/patch-2Tres Seaver
2013-04-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-23add a note about missing codeTshepang Lekhonkhobe
2013-04-22Merge pull request #997 from tshepang/patch-2Michael Merickel