summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-16close resources and 80-char line widthMichael Merickel
2014-05-16Expand tests - make sure pdf, jpeg types also are not annotated with a charset.Dobes Vandermeer
2014-05-16Add tests for the content_type fix.Dobes Vandermeer
2014-05-16Don't incorrectly default charset on FileResponsedobesv
By passing the content_type into the constructor to Response, we can allow it to decide intelligently whether the default charset should apply. Otherwise we'd have to replicate that logic somehow, or live with weird charset annotations on images, pdfs, and zips.
2014-05-13Merge pull request #1341 from bertjwregeer/fix.typoMichael Merickel
Update hooks.rst
2014-05-13Update hooks.rstsynthomat
'self' param was omitted in the constructor of simple_tween_factory class
2014-05-07Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325Michael Merickel
2014-05-06Added required notes to changes/contributors file.Fenton Travers
2014-05-05Merge pull request #1322 from Pylons/fix.setUp-relative-packageMichael Merickel
modify p.testing.setUp() to configure the package relative to caller
2014-05-05modify p.testing.setUp() to configure the package relative to callerMichael Merickel
2014-05-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-05fix merge conflictsChris McDonough
2014-05-05Merge pull request #1335 from flibustenet/patch-3Michael Merickel
Order of response_callback in the docstring
2014-05-05modify changes wrt logging config strippingChris McDonough
2014-05-05Merge branch 'redundant_totuorial_logging_config'Chris McDonough
2014-05-05Merge branch 'master' into redundant_totuorial_logging_configChris McDonough
2014-05-05Order of response_callback in the docstringflibustenet
2014-05-03Merge pull request #1333 from stevepiercy/masterSteve Piercy
- add a reference
2014-05-03- add a referenceSteve Piercy
2014-05-03Merge pull request #1332 from stevepiercy/masterSteve Piercy
- looks like _ are now - in RTD
2014-05-03- looks like _ are now - in RTDSteve Piercy
2014-05-03Merge pull request #1331 from stevepiercy/masterSteve Piercy
- add cookbook to intersphinx mapping
2014-05-03- add cookbook to intersphinx mappingSteve Piercy
2014-05-03Merge pull request #1330 from stevepiercy/masterSteve Piercy
- spelling
2014-05-03- spellingSteve Piercy
2014-05-01fix #1253Michael Merickel
2014-04-29require ISession.invalidate to leave behind a usable sessionMichael Merickel
2014-04-27Merge pull request #1327 from invisibleroads/patch-1Steve Piercy
Replaced five minutes with one hour
2014-04-27Update static.pyRoy Hyunjin Han
2014-04-27Replaced five minutes with one hourRoy Hyunjin Han
2014-04-24Replaced non-ascii copyright character with HTML equivalent.Fenton Travers
2014-04-24The copyright symbol causes this error:Fenton Travers
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 2559: ordinal not in range(128)
2014-04-24Merge pull request #1321 from omidraha/patch-1Steve Piercy
Improving `X-Vhm-Root` paragraphs.
2014-04-24Merge pull request #1323 from bmess/narrative_typoMichael Merickel
Typo found in second Declarative code block
2014-04-23Typo found in second Declarative code blockbobby
There were two import statements for Configurator. I removed the second import statement in the "__main__" since most of the documentation declares all imports on the top of the source. modified: configuration.rst
2014-04-23remove redundant testsMichael Merickel
2014-04-23Merge pull request #1320 from bertjwregeer/feature.raise_valueerror_wsgiMichael Merickel
Feature: raise ValueError if wrapped is None in wsgiapp/wsgiapp2
2014-04-24Improving `X-Vhm-Root` paragraphs.Omid Raha
Improving text of `X-Vhm-Root` paragraphs in `Other Backwards Incompatibilities` section.
2014-04-23Remove repeated word.Omid Raha
Remove repeated `use` word.
2014-04-22Update CHANGES for wsgiapp and wsgiapp2Bert JW Regeer
2014-04-22Verify that wrapped is not NoneBert JW Regeer
If wrapped is None we raise a ValueError to let the user know that we are unable to continue.
2014-04-21Merge pull request #1318 from stevepiercy/masterSteve Piercy
port to master branch - Update background section same as quick_tour.rst
2014-04-21Update background section same as quick_tour.rstSteve Piercy
Update text of ``background`` section same as ``sessions`` section of ``quick_tour.rst``
2014-04-20Merge pull request #1313 from goodwillcoding/scaffold_versiongoodwillcoding
Issue: #1300, pyramid versiona and scaffold docs, add correct handling for dev docs which now points to 'master' docs
2014-04-20add correct handling for dev docs which now points to 'master' docsgoodwillcoding
2014-04-20Merge branch 'pull.1300'Michael Merickel
2014-04-20remove special case for dev branchesMichael Merickel
the way pyramid's RTD works is that doc changes are rendered automatically on each release branch, so dev versions should actually point at their parent branch for the most up-to-date docs
2014-04-20update the version detection to use better regex matching for versiongoodwillcoding
and add more test cases
2014-04-20refine language some more to say 'Pyramid' lessgoodwillcoding
2014-04-20standardize on scaffold over template naminggoodwillcoding