summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-24Merge pull request #285 from michr/012b9762Chris McDonough
fix up all the ..note and ..warnings.
2011-09-23fixed up all the warning dealing ..note and ..warnmichr
added a hide toc for glossary to prevent warnings
2011-09-23Merge branch 'master' of git://github.com/Pylons/pyramidmichr
2011-09-23Merge pull request #284 from replaceafill/patch-1Chris McDonough
resource_url call error in docs/narr/resources.rst
2011-09-23Edited docs/narr/resources.rst via GitHubDouglas Cerna
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
testing dependency. - Pyramid now depends on a ``zope.interface`` version greater than or equal to 3.8.0.
2011-09-20Merge pull request #282 from dairiki/masterChris McDonough
Trivial grammar/punctuation fix
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
Small addition to API documentation
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
See https://github.com/Pylons/pyramid/issues/276. Closes #276.
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 ↵Chris McDonough
(third-party) tests
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
Corrected verb to agree with singular subject "Pyramid".
2011-09-09Merge pull request #269 from stevepiercy/patch-2Chris McDonough
Insert missing "to".
2011-09-09Merge pull request #275 from stevepiercy/patch-8Chris McDonough
"CMS systems" is redundant, so spelled out acronym.
2011-09-09Merge pull request #274 from stevepiercy/patch-7Chris McDonough
"internalization-related" s/b "internationalization-related"
2011-09-09Merge pull request #273 from stevepiercy/patch-6Chris McDonough
Insert missing "to".
2011-09-09Merge pull request #272 from stevepiercy/patch-5Chris McDonough
Correct spelling of "chages" to "changes".
2011-09-09Merge pull request #271 from stevepiercy/patch-4Chris McDonough
Removed line break in hyphenation of "import-time" which rendered as "imp
2011-09-09static views with the same name were not distinct, even if they were ↵Chris McDonough
disambiguated via a route prefix; closes #266
2011-09-09"CMS systems" is redundant, so spelled out acronym.Steve Piercy
2011-09-09"internalization-related" s/b "internationalization-related"Steve Piercy
2011-09-09Insert missing "to".Steve Piercy
2011-09-09Correct spelling of "chages" to "changes".Steve Piercy
2011-09-09Removed line break in hyphenation of "import-time" which rendered as ↵Steve Piercy
"import- time".
2011-09-09Corrected verb to agree with singular subject "Pyramid".Steve Piercy
2011-09-09Insert missing "to".Steve Piercy
2011-09-09reorderChris McDonough