summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-03Merge pull request #968 from tshepang/diffTres Seaver
2013-04-03add some more cross-referencesTshepang Lekhonkhobe
2013-04-03add zope.component to intersphinx_mapping dictTshepang Lekhonkhobe
2013-04-03update changelogMichael Merickel
2013-04-03Merge branch 'fix.954'Michael Merickel
2013-04-03fix #954Michael Merickel
2013-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-03minor typo correction 'prepresents'-->'represents'thapar
2013-04-02Merge pull request #965 from tshepang/copyrightChris McDonough
2013-04-02remove copyright bits from the tutorial examplesTshepang Lekhonkhobe
2013-04-02fix #964Michael Merickel
2013-04-01update changelogMichael Merickel
2013-04-01Merge branch 'pull.952'Michael Merickel
2013-04-01Merge branch 'fix.950' of Beanfield/pyramid into pull.952Michael Merickel
2013-04-01Merge pull request #958 from tshepang/ripMichael Merickel
2013-04-01Merge branch 'pull.963'Michael Merickel
2013-04-01remove extra wordMichael Merickel
2013-04-01Improve phrasingCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Add missing wordCatalin Iacob
2013-04-01Consistently link middleware term to the glossaryCatalin Iacob
2013-04-01Fix grammarCatalin Iacob
2013-04-01Use into instead of in toCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Remove unused imports from code sampleCatalin Iacob
2013-04-01Fix typo that broke the reference to pyramid.events.NewRequestCatalin Iacob
2013-04-01my.package.MyJinja2Renderer is registered for .jinja2 files not .jinjaCatalin Iacob
2013-04-01Fix reST markupCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Fix reST markup and spelling of "hand"Catalin Iacob
2013-04-01Fix wrong reference to non existent getAjax functionCatalin Iacob
2013-04-01Merge pull request #962 from tshepang/refsMichael Merickel
2013-04-01fix some cross-referencesTshepang Lekhonkhobe
2013-03-31Merge pull request #961 from tshepang/refsMichael Merickel
2013-03-31fix some cross-referencesTshepang Lekhonkhobe
2013-03-30Merge pull request #959 from tshepang/refsTres Seaver
2013-03-31fix some cross-referencesTshepang Lekhonkhobe
2013-03-29remove copyright bits from the scaffoldsTshepang Lekhonkhobe
2013-03-29Merge pull request #945 from tshepang/importsTres Seaver
2013-03-29Merge pull request #957 from tshepang/patch-1Tres Seaver
2013-03-29grammarTshepang Lekhonkhobe
2013-03-28Merge pull request #955 from tshepang/toolbarChris McDonough
2013-03-28enable Sphinx cross-referencing for pyramid_toolbarTshepang Lekhonkhobe
2013-03-28fix linkTshepang Lekhonkhobe
2013-03-28Added name to CONTRIBUTORS file.Jason
2013-03-27Spaces and dots may now be in mako renderer template paths. Fixes #950.Jason
2013-03-26Merge pull request #949 from tshepang/patch-1Tres Seaver
2013-03-26fix #948Tshepang Lekhonkhobe