summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-09-01Merge pull request #1887 from stevepiercy/masterSteve Piercy
2015-09-01- add pylonswebframework to intersphinx config, sort entries so they can be f...Steve Piercy
2015-08-31Merge branch 'pull.1866'Michael Merickel
2015-08-31fix difference between py2 and py3 with base64.b64decodeMichael Merickel
2015-08-31Merge branch 'fixes/cookie_values' of bertjwregeer/pyramid into pull.1866Michael Merickel
2015-08-31update changelogMichael Merickel
2015-08-31Merge branch 'fixes/HTTPMove' of bertjwregeer/pyramid into pull.1865Michael Merickel
2015-08-31Merge pull request #1884 from stevepiercy/masterSteve Piercy
2015-08-31move extra credit question about @forbidden_view_config from authentication t...Steve Piercy
2015-08-24Merge pull request #1880 from stevepiercy/masterSteve Piercy
2015-08-24document +dot+ for dotfiles in scaffoldsAlexandre Conrad
2015-08-10Merge pull request #1871 from stevepiercy/masterSteve Piercy
2015-08-10Fix minor typoIsmail
2015-08-03base64 encode cookie valuesBert JW Regeer
2015-08-03Fix Pyramid against WebOb >=1.5.0Bert JW Regeer
2015-07-29Add a bandaid; provide correct rationale of using easy_install over pip, for nowChris McDonough
2015-07-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-07-22Merge pull request #1861 from davidjb/patch-2Steve Piercy
2015-07-23Use correct cache argument in cache busting docoDavid Beitey
2015-07-15fix for #1846, incorrect pointers to nonexistent webob propertiesChris McDonough
2015-06-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-18Merge pull request #1852 from stevepiercy/masterSteve Piercy
2015-06-18rst numbering syntaxSteve Piercy
2015-06-18Merge pull request #1847 from stevepiercy/masterSteve Piercy
2015-06-18combine extra credit sectionsSteve Piercy
2015-06-11Merge pull request #1842 from stevepiercy/masterSteve Piercy
2015-06-11Update authorization.rstorangieboot
2015-06-10Merge pull request #1838 from jenner/contibutor-for-1837Michael Merickel
2015-06-11added appropriate contributors and changes entriesIgor Stroh
2015-06-10Merge pull request #1837 from jenner/pcreate-check-existing-namesMichael Merickel
2015-06-11use input_ from p.compat, renamed optionIgor Stroh
2015-06-10added py2.6 compatibility, removed test for 'site'Igor Stroh
2015-06-10make sure user input is py2.x/py3 compatibleIgor Stroh
2015-06-10removed unused exceptionsIgor Stroh
2015-06-10handle conflicting project names gracefully, fixes: #1357Igor Stroh
2015-06-09Merge pull request #1836 from Pylons/fix-1832-masterTres Seaver
2015-06-09Return concrete classes from 'pyramid.httpexceptions.exception_response'.Tres Seaver
2015-06-06Merge pull request #1831 from stevepiercy/masterSteve Piercy
2015-06-06cherry pick 1.6-branch to masterSteve Piercy
2015-06-06Merge pull request #1829 from kissgyorgy/masterTres Seaver
2015-06-06More idiomatic codeKiss György
2015-06-05We explicitly pass in the interfaces provided by the request asChris McDonough
2015-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-01Merge pull request #1823 from kilodalton/fixQuickTutorialDatabasesMichael Merickel
2015-06-01added name to contributors listKaren Dalton
2015-06-01add self.config = testing.setUp and testing.tearDown back to WikiViewTests as...Karen Dalton
2015-06-01remove some calls to the testing module and self.config as they are not usedKaren Dalton
2015-06-01Add additional logging configs necessary for db script output and update test...Karen Dalton
2015-05-31Merge pull request #1817 from stevepiercy/masterSteve Piercy
2015-05-31- update testing and templating remarksSteve Piercy