summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-04change variable name ``name`` to ``pagename``, for consistency with the view_...Daniel Haaker
2012-08-04Merge pull request #651 from dhaaker/docfixBlaise Laflamme
2012-08-04add quotes for clarityDaniel Haaker
2012-08-04fix two minor typos in docsDaniel Haaker
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Merge branch 'wwitzel3-ww/doc-changes'Chris McDonough
2012-08-03no period required hereChris McDonough
2012-08-03Merge branch 'ww/doc-changes' of git://github.com/wwitzel3/pyramid into wwitz...Chris McDonough
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Removing easy_install and demoing lines from index example. firstapp has inst...Wayne Witzel III
2012-08-03Merge pull request #642 from wwitzel3/ww/doc-changesChris McDonough
2012-08-03Adding helpful link to installing chapter from first appWayne Witzel III
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03added entry to changes.txt for mako fixBlaise Laflamme
2012-08-03added test for adjusted uri in mako templatesBlaise Laflamme
2012-08-02Merge branch 'refs/heads/master' into fix.mako-606Blaise Laflamme
2012-08-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-02closes #643Chris McDonough
2012-07-29Merge branch 'feature.predmismatchexc'Chris McDonough
2012-07-29- When there is a predicate mismatch exception (seen when no view matches forChris McDonough
2012-07-29Merge branch 'master' of git://github.com/adroullier/pyramid into adroullier-...Chris McDonough
2012-07-29give traverse_predicate a __text__ and add a developer note about __text__Chris McDonough
2012-07-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-25add logging call to wsgi setupMichael Merickel
2012-07-21Merge pull request #640 from countvajhula/patch-1Chris McDonough
2012-07-21corrected table name tables->pagesSiddhartha Kasivajhula
2012-07-13- On at least one 64-bit Ubuntu system under Python 3.2, using theChris McDonough
2012-07-10gardenChris McDonough
2012-07-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-10Merge pull request #634 from 2nd/fix.urldispatch-629Michael Merickel
2012-07-10Replacement markers of url dispatcher can contain regex with colons.Maxim Avanov
2012-07-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-04Merge pull request #632 from sjuxax/masterBlaise Laflamme
2012-07-04Include instructions for recursive submodule checkout of Sphinx themes.Jeff Cook
2012-06-29fixed mako bug #606 for inheritance and includesBlaise Laflamme
2012-06-26Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-06-24Send notifications to pyramid-checkins.Tres Seaver
2012-06-24Un-comment the PyPy 'allow_failures' bit.Tres Seaver
2012-06-24Try newly-enabled travis-ci.Tres Seaver
2012-06-19point at pyramid_beaker docs rather than its github pageChris McDonough
2012-06-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-06-19fixed typosBlaise Laflamme
2012-06-19fixed typosBlaise Laflamme
2012-06-19added docs and changes for using defs in mako rendererBlaise Laflamme
2012-06-19renamed path for asset in regexBlaise Laflamme
2012-06-19removed .makodef, use tuple value if defname in renderer (bw compat), changed...Blaise Laflamme
2012-06-19added removed tuple for bw compatBlaise Laflamme