summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
remove copyright bits from the scaffolds
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
Seems more correct and is consistent with the usage a few words further.
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Remove unused imports from code sampleCatalin Iacob
The import should be done only when actually using the global registry.
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
fix some cross-references
2013-04-01fix some cross-referencesTshepang Lekhonkhobe
2013-03-31Merge pull request #961 from tshepang/refsMichael Merickel
fix some cross-references
2013-03-31fix some cross-referencesTshepang Lekhonkhobe
2013-03-30Merge pull request #959 from tshepang/refsTres Seaver
fix some cross-references
2013-03-31fix some cross-referencesTshepang Lekhonkhobe
Also add webtest to intersphinx_mapping
2013-03-29remove copyright bits from the scaffoldsTshepang Lekhonkhobe
see https://github.com/Pylons/pyramid/pull/953#issuecomment-15650552
2013-03-29Merge pull request #945 from tshepang/importsTres Seaver
mention a coding convention
2013-03-29Merge pull request #957 from tshepang/patch-1Tres Seaver
grammar
2013-03-29grammarTshepang Lekhonkhobe
2013-03-28Merge pull request #955 from tshepang/toolbarChris McDonough
toolbar-related doc improvements
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
fix #948
2013-03-26fix #948Tshepang Lekhonkhobe
2013-03-25Merge pull request #947 from tshepang/clarityMichael Merickel
use clearer language
2013-03-25use clearer languageTshepang Lekhonkhobe
2013-03-25Merge pull request #946 from tshepang/diffMichael Merickel
improve description; fix link
2013-03-25mention a coding conventionTshepang Lekhonkhobe
2013-03-25improve description; fix linkTshepang Lekhonkhobe
2013-03-25Merge pull request #940 from tshepang/diffChris McDonough
no need to qualify Python interactive sessions
2013-03-25Merge pull request #941 from stevepiercy/masterChris McDonough
place colon within strong style
2013-03-25give installation a colectomy; give it headings;Steve Piercy
2013-03-25Merge remote branch 'upstream/master'Steve Piercy
2013-03-24Merge pull request #944 from tshepang/hyperMichael Merickel
make example links clickable, for convenience
2013-03-25make example links clickable, for convenienceTshepang Lekhonkhobe
2013-03-24Merge pull request #943 from tshepang/hyperChris McDonough
make example links clickable, for convenience