summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-04-19Merge pull request #1627 from bertjwregeer/security/jsonpMichael Merickel
2015-04-19Merge branch 'pr/1571'Michael Merickel
2015-04-19touch up pr 1571Michael Merickel
2015-04-19add epub to docs and specify a env-specific build dir for docsMichael Merickel
2015-04-17default response_callback and finished_callback to an empty deque instead of ...Michael Merickel
2015-04-16Merge pull request #1636 from stevepiercy/masterSteve Piercy
2015-04-16- update sphinx makefileSteve Piercy
2015-04-16Merge pull request #1635 from stevepiercy/masterSteve Piercy
2015-04-16try to get RTD to buildSteve Piercy
2015-04-16Merge pull request #1634 from stevepiercy/masterSteve Piercy
2015-04-16Replace git submodule crap with new pylons-sphinx-themes package goodness. Se...Steve Piercy
2015-04-15Merge pull request #1633 from dairiki/bug.temporary_responseMichael Merickel
2015-04-15Add pylonshq and pylonsrtd items to updateSteve Piercy
2015-04-15Restore request.response if renderer raises exceptionJeff Dairiki
2015-04-15Add tests for temporary_response context managerJeff Dairiki
2015-04-15Merge pull request #1632 from tisdall/master-docupdateMichael Merickel
2015-04-15Merge branch '1.6-branch'Chris McDonough
2015-04-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-15meta related to whatsnew changingChris McDonough
2015-04-15mention adding links in whatsnew for minor revsTim Tisdall
2015-04-15Merge pull request #1631 from tisdall/1.6-docupdateMichael Merickel
2015-04-15typoTim Tisdall
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15master is now 1.7Chris McDonough
2015-04-15Merge branch '1.6-branch'Chris McDonough
2015-04-14Merge branch 'master' into 1.6-branchChris McDonough
2015-04-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-14prep for 1.6a1Chris McDonough
2015-04-144 comes after 3Steve Piercy
2015-04-14use 1.6 branch badgeChris McDonough
2015-04-14no need to explicitly try to build docs, its now part of a tox runChris McDonough
2015-04-14minor wording changeChris McDonough
2015-04-14no longer in-progress on this branchChris McDonough
2015-04-14move 1.5 stuff to HISTORY.txt and label 1.6 in changesChris McDonough
2015-04-14add docs enhancements section and supply more info about scaffolding changesChris McDonough
2015-04-14add a whats new for 1.6Chris McDonough
2015-04-14Merge pull request #1629 from ztane/masterTres Seaver
2015-04-14fixed documentation; wrong line in docsAntti Haapala
2015-04-14Add some validation for the JSONP callbackBert JW Regeer
2015-04-13Ignore more pep8 checks and add to travisJohn Anderson
2015-04-13add convenience shell scriptsChris McDonough
2015-04-13change releasing and hacking docs to reflect new order of using tox to test d...Chris McDonough
2015-04-13Merge branch 'master' of https://github.com/Pylons/pyramid into start_pep8John Anderson
2015-04-13unbreak toxChris McDonough
2015-04-13make it possible to run scaffold functests using toxChris McDonough
2015-04-12omg how embarrassing, forgot to run tests before merging the request subclass...Chris McDonough
2015-04-12add change note related to #1529Chris McDonough
2015-04-12Merge branch 'bertjwregeer-bug/request_subclassing'Chris McDonough
2015-04-12merge master back into this PR branchChris McDonough