summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-01-01Merge branch 'tshepang-issue746'Chris McDonough
2013-01-01fix rationale and typoChris McDonough
2013-01-01Merge branch 'issue746' of git://github.com/tshepang/pyramid into tshepang-is...Chris McDonough
2013-01-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-01fix #746: explain why a dev package is installedTshepang Lekhonkhobe
2013-01-01Small fix for RST misfire.Paul Everitt
2013-01-01Merge pull request #752 from tshepang/masterChris McDonough
2013-01-01give virtualenv directory a more generic name, "venv"Tshepang Lekhonkhobe
2013-01-01Merge pull request #751 from tshepang/masterChris McDonough
2013-01-01"usernames" is a more correct termTshepang Lekhonkhobe
2012-12-31Merge pull request #750 from tshepang/masterChris McDonough
2013-01-01typoTshepang Lekhonkhobe
2012-12-28Merge pull request #748 from tshepang/masterChris McDonough
2012-12-29typoTshepang Lekhonkhobe
2012-12-22Merge pull request #745 from reinout/patch-1Carlos de la Guardia
2012-12-22Typo pakage => packageReinout van Rees
2012-12-18prep for 1.4Chris McDonough
2012-12-18gardenChris McDonough
2012-12-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-17Merge pull request #741 from ppaez/zodb-tutorial-fixesChris McDonough
2012-12-13Improvements to the ZODB tutorial Tests chapterPatricio Paez
2012-12-13Make ZODB tutorial functional tests passPatricio Paez
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b3Chris McDonough
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b2Chris McDonough
2012-12-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-10Merge pull request #736 from msabramo/docs-tutorials-wiki2-tweaksChris McDonough
2012-12-10Merge pull request #738 from ppaez/pep8_scaffoldsChris McDonough
2012-12-06add changenoteChris McDonough
2012-12-06make _backframes work like _depth (but still leave undocumented)Chris McDonough
2012-12-06note custom_predicates deprecationChris McDonough
2012-12-06Merge branch '1.4-branch'Chris McDonough
2012-12-06Merge branch '1.4-branch' of github.com:Pylons/pyramid into 1.4-branchChris McDonough
2012-12-06Merge pull request #739 from mmerickel/fix.view-config-depthChris McDonough
2012-12-06_depth argument to view_config is now relative to view_configMichael Merickel
2012-12-02Sync tests.py and views.py in SQL wiki tutorialPatricio Paez
2012-12-02Sync initializedb.py in SQL wiki tutorialPatricio Paez
2012-12-01Sync models.py in SQL wiki tutorialPatricio Paez
2012-12-01Sync __init__.py in SQL wiki tutorialPatricio Paez
2012-12-01unused importChris McDonough
2012-12-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-01Sync setup.py in SQL wiki tutorialPatricio Paez
2012-12-01Update line referencesPatricio Paez
2012-12-01Sync ZODB tutorial source files with the scaffoldPatricio Paez
2012-11-30tutorials/wiki2/definingviews.rst: Change example error page fromMarc Abramowitz
2012-11-30A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2Marc Abramowitz
2012-11-29Sync MyProject files with the starter scaffoldPatricio Paez
2012-11-29make scaffolds pep8 compliantGael Pasgrimaud
2012-11-29Merge pull request #734 from slinkp/masterChris McDonough