summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-12-01unused importChris McDonough
2012-12-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-29Merge pull request #734 from slinkp/masterChris McDonough
2012-11-29Fix broken link to contributor docsPaul Winkler
2012-11-27Merge pull request #716 from ericrasmussen/scaffolds.requiresfixChris McDonough
2012-11-27Merge pull request #732 from ppaez/transaction-dependencyChris McDonough
2012-11-22typosChris McDonough
2012-11-22Sync the tutorial docs for the transaction dependencyPatricio Paez
2012-11-22more appeasementChris McDonough
2012-11-22appeasementChris McDonough
2012-11-21prep for 1.4b1Chris McDonough
2012-11-21prep for releaseChris McDonough
2012-11-21document new introspectable attrsChris McDonough
2012-11-21missed adding this fileChris McDonough
2012-11-21Merge branch 'feature.eventonly'Chris McDonough
2012-11-21fix for py3Chris McDonough
2012-11-21add an integration test for the eventonly behaviorChris McDonough
2012-11-21gardenChris McDonough
2012-11-21gardenChris McDonough
2012-11-21- In order to normalize the relationship between event subscribers andChris McDonough
2012-11-20adding transaction module requirement to zodb wiki docsericrasmussen
2012-11-20add transaction dependency to zodb scaffoldericrasmussen
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