summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-11-20gardenChris McDonough
2012-11-20Merge branch 'sontek-fix_commands'Chris McDonough
2012-11-20gardenChris McDonough
2012-11-20gardenChris McDonough
2012-11-20Merge branch 'master' into sontek-fix_commandsChris McDonough
2012-11-20coverageChris McDonough
2012-11-20Merge branch 'fix_commands' of git://github.com/sontek/pyramid into sontek-fi...Chris McDonough
2012-11-20gardenChris McDonough
2012-11-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-20Merge pull request #730 from ppaez/update-tutorial-filesChris McDonough
2012-11-20Sync views.py on SQL wiki tutorial with the scaffoldPatricio Paez
2012-11-20More sync on ZODB wiki tutorialPatricio Paez
2012-11-20Merge branch 'feature.response-gardenpath'Chris McDonough
2012-11-20- Small microspeed enhancement which anticipates that aChris McDonough
2012-11-19Sync some ZODB wiki tutorial files with the scaffoldPatricio Paez
2012-11-19Sync some SQL wiki tutorial files with the scaffoldPatricio Paez
2012-11-18Merge branch 'sontek-add_contributors'Chris McDonough
2012-11-18fix merge conflictChris McDonough
2012-11-18- A failure when trying to locate the attribute ``__text__`` on route and viewChris McDonough
2012-11-14Added myself to contributorsJohn Anderson
2012-11-14Don't use a global mutable and updated the doc string to include optionsJohn Anderson
2012-11-14Merge branch '1.4-branch'Chris McDonough
2012-11-14prep for releaseChris McDonough
2012-11-14update for releaseChris McDonough
2012-11-14rearrange deck chairsChris McDonough
2012-11-14make an assertion in this testChris McDonough
2012-11-14Merge branch 'fix_commands' of git://github.com/sontek/pyramid into sontek-fi...Chris McDonough
2012-11-14remove duplicate whatsnew entry (forward port from 1.3 branchChris McDonough
2012-11-14ref #725; indicate how to join the result of render_view_to_iterableChris McDonough
2012-11-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-13indicate render_view returns a bytestring (see #725)Michael Merickel
2012-11-13updated changelogMichael Merickel
2012-11-13Merge branch 'pull.725' which closes #721Michael Merickel
2012-11-13simplfied change as response.app_iter must contain bytes per pep 3333Michael Merickel
2012-11-13Merge branch 'master' of avolkov/pyramid into pull.725Michael Merickel
2012-11-13My fix for Issue #721. Made view.py - render_view to convert iterable inputAlex Volkov
2012-11-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-13forward port from 1.3 branchChris McDonough
2012-11-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-12removed doc-update from changelogMichael Merickel
2012-11-12Merge branch 'fix.516' of rob0t7/pyramid into pull.720Michael Merickel
2012-11-12Added changes to the CHANGES log.Robert Jackiewicz
2012-11-12Modified the hooks documentation to currently describe how to access the cont...Robert Jackiewicz
2012-11-12Move pyramid.config.views.viewdefaults -> pyramid.util.viewdefaultsChris McDonough
2012-11-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-11- Be more tolerant of potential error conditions in ``match_param`` andChris McDonough
2012-11-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-05added the ability to pass options to get_app for use with stringJohn Anderson
2012-11-04visually aid the decorator= examplePhilip Jenvey
2012-11-04update changelog, close #627Michael Merickel