summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-17Merge branch 'sjuxax-master'Chris McDonough
2012-06-17merge contributorsChris McDonough
2012-06-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
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-14Merge pull request #616 from msabramo/testingChris McDonough
Add py33 to tox and add .travis.yml for Travis CI
2012-06-14Remove blank line from .travis.ymlMarc Abramowitz
2012-06-14Add "Marc Abramowitz" to CONTRIBUTORS.txtMarc Abramowitz
2012-06-14Add .travis.yml for Travis CI (http://travis-ci.org/)Marc Abramowitz
2012-06-13Add "py33" to tox.iniMarc Abramowitz
2012-06-13Merge pull request #610 from fabianbuechler/patch-1Chris McDonough
Fixed errors in URL dispatch docs in "Using a Route Prefix to Compose Applications" section
2012-06-12docs reference setup_logging instead of fileConfigMichael Merickel
2012-06-11consolidateChris McDonough
2012-06-11how to build HTML docsChris McDonough
2012-06-07renderingChris McDonough
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
Added missing word for clarity.
2012-05-31Added missing word "name" Zeb Palmer
2012-05-23Fixed a few glitches in the "Using a Route Prefix to Compose Applications" ↵Fabian Büchler
section of the docs/narr/urldispatch.rst docs.
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
Corrected a few spelling and grammar errors and removed double backslash in `C:\`.
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 ↵Chris McDonough
dependencies section
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
Two grammatical fixes
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
Added name to CONTRIBUTORS.txt
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-06 16:02:57 +0000