summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-06-17CONTRIBUTORS: Add self / accept contribution termsJeff Cook
2012-06-17docs: Add view callable example to section on rendering_val.Jeff Cook
2012-06-07Update documentation to clarify purpose of BeforeRender.rendering_val.Jeff Cook
2012-06-04point back to renderer_system_values in render and render_to_responseChris McDonough
2012-06-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-31Merge pull request #614 from zebpalmer/masterBlaise Laflamme
2012-05-31Added missing word "name" Zeb Palmer
2012-05-16Fix resource leak warning under Py3k.Tres Seaver
2012-05-16Remove last class advice usage (breaks under Py3k with new zope.interface.Tres Seaver
2012-05-15Merge pull request #603 from bboe/patch-1Chris McDonough
2012-05-15Fixed spelling errors and double backslash in `C:\`.Bryce Boe
2012-05-12configurator, not configurationChris McDonough
2012-05-12remove uses-interfaces-too-liberally (this was only true of bfg) and update d...Chris McDonough
2012-05-11add link to explanationChris McDonough
2012-05-09Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-09activate sphinx.ext.viewcode extensionChris McDonough
2012-05-07Merge pull request #598 from ppaez/paulo-grammatical-fixPatricio Paez
2012-05-07Two grammatical fixesPatricio Paez
2012-05-06added sphinx theme as submodule, added rtd hack to update themeBlaise Laflamme
2012-05-04add python 3 as a uniquenessChris McDonough
2012-05-04gardenChris McDonough
2012-05-04add introspection to whats uniqueChris McDonough
2012-05-03gardenChris McDonough
2012-05-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-03reuse default logic between json and jsonpChris McDonough
2012-05-03use the same default logic for jsonp as for jsonChris McDonough
2012-05-03Merge pull request #595 from vipera/masterMichael Merickel
2012-05-03Updated contributors fileMarin Rukavina
2012-05-03Merge branch 'mmerickel-feature.json-api'Chris McDonough
2012-05-03allow __json__ and custom adapters to accept request argChris McDonough
2012-05-03Merge branch 'master' into feature.json-apiMichael Merickel
2012-05-02gardenChris McDonough
2012-05-02Merge branch 'vipera-master'Chris McDonough
2012-05-02add a change noteChris McDonough
2012-05-02simplify testsChris McDonough
2012-05-02Merge https://github.com/vipera/pyramid into vipera-masterChris McDonough
2012-05-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-02Updated tests for static files and made static.py raise all HTTP exceptionsMarin Rukavina
2012-05-02Fixed up the tests and returned HTTPMovedPermanentlyMarin Rukavina
2012-05-01Merge remote-tracking branch 'Pylons/master'Marin Rukavina
2012-04-30Merge pull request #592 from danjacka/masterChris McDonough
2012-05-01Change the example script's description string to match the console_script's ...Dan Jacka
2012-04-29Merge pull request #591 from danjacka/masterChris McDonough
2012-04-30Separator between name and value in --header option to prequest is ':', not '='Dan Jacka
2012-04-29Merge pull request #590 from ppaez/docsPatricio Paez
2012-04-29Normalize 'Make a project' on both wiki tutorialsPatricio Paez
2012-04-28Merge pull request #589 from stevepiercy/masterChris McDonough
2012-04-28expand glossary term for scaffoldSteve Piercy
2012-04-28Merge pull request #588 from stevepiercy/masterChris McDonough
2012-04-28Link the first usage of "scaffold" to its definition in the glossary.Steve Piercy