summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-16Tests for adding view derivationsCasey Duncan
2015-04-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-15Merge pull request #1633 from dairiki/bug.temporary_responseMichael Merickel
2015-04-15Add pylonshq and pylonsrtd items to updateSteve Piercy
2015-04-15Finish porting original view deriver testsCasey Duncan
2015-04-15Restore request.response if renderer raises exceptionJeff Dairiki
2015-04-15Add tests for temporary_response context managerJeff Dairiki
2015-04-15start of fixing test.Amos Latteier
2015-04-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into c...Amos Latteier
2015-04-15Fix some tests that had bad capitalization, and fix a missing import.Amos Latteier
2015-04-15fix more derivation testsCasey Duncan
2015-04-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into c...Casey Duncan
2015-04-15moar deriver test fixesCasey Duncan
2015-04-15Fix package name in tests.Amos Latteier
2015-04-15wip factor out deriver testsCasey Duncan
2015-04-15Add missed view deriver.Amos Latteier
2015-04-15Store derivers in registry, not config, since new configs are created (losing...Amos Latteier
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-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into c...Casey Duncan
2015-04-15add default view derivations to configurator in testing.setUp()Casey Duncan
2015-04-15mention adding links in whatsnew for minor revsTim Tisdall
2015-04-15Add missing imports.Amos Latteier
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-15wip derivationsCasey Duncan
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-14Alchemy Scaffold UpdateRandy Topliffe
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