summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2011-09-24Merge https://github.com/nmclean/pyramid into nmclean-masterChris McDonough
2011-09-24requestonly testNat McLean
2011-09-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-24Merge pull request #289 from michr/masterChris McDonough
2011-09-24forward compat repr fixesChris McDonough
2011-09-24not quite trueChris McDonough
2011-09-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-24Merge branch 'master' of git://github.com/Pylons/pyramidMichael
2011-09-24Merge pull request #288 from michr/4ac7538fChris McDonough
2011-09-24Merge branch 'master' of git://github.com/Pylons/pyramidMichael
2011-09-24Merge pull request #285 from michr/012b9762Chris McDonough
2011-09-24check behaviorChris McDonough
2011-09-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-23add documenteation for the __text__ attribute for a predicatemichr
2011-09-23exclude book pages (foreword.rst, latexindex.rst, authorintro.rst)michr
2011-09-23fixed up all the warning dealing ..note and ..warnmichr
2011-09-23Merge branch 'master' of git://github.com/Pylons/pyramidmichr
2011-09-23Merge pull request #284 from replaceafill/patch-1Chris McDonough
2011-09-23Edited docs/narr/resources.rst via GitHubDouglas Cerna
2011-09-23fixed config.views.requestonlyNat McLean
2011-09-22fix up warning rendering in chameleon.zpt ... a drop in a bucketmichr
2011-09-22ignore all dirs that start with envChris McDonough
2011-09-22Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-22- Pyramid no longer depends on the zope.component package, except as aChris McDonough
2011-09-20Merge pull request #282 from dairiki/masterChris McDonough
2011-09-20Trivial grammar fixJeff Dairiki
2011-09-16spelling error fixes issue #280Michael Merickel
2011-09-12prep for 1.2Chris McDonough
2011-09-12call out the debug toolbar explicitlyChris McDonough
2011-09-12debugtoolbar identifier changedChris McDonough
2011-09-12gardenChris McDonough
2011-09-12get rid of the airquotes everywhereChris McDonough
2011-09-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-12Merge pull request #278 from dhaaker/doc-patch-1Chris McDonough
2011-09-12explain NO_PERMISSION_REQUIRED constant in API docsDaniel Haaker
2011-09-12document replacement marker compositionChris McDonough
2011-09-12- Route pattern replacement marker names can now begin with an underscore.Chris McDonough
2011-09-11gardenChris McDonough
2011-09-11eliminate lie in docstringChris McDonough
2011-09-11update docstringChris McDonough
2011-09-11removed unused lockChris McDonough
2011-09-11gardenChris McDonough
2011-09-11prep for 1.2b3Chris McDonough
2011-09-10futureproof by importing at function scopeChris McDonough
2011-09-10gardenChris McDonough
2011-09-10look up the registry using a threadlocal for bw compatibility in existing (th...Chris McDonough
2011-09-09chameleon runs on pypy now, no need to do conditional importsChris McDonough
2011-09-09remove unused importChris McDonough
2011-09-09Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-09-09Merge pull request #270 from stevepiercy/patch-3Chris McDonough