summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-22fix project urlMichael Merickel
2014-05-21oops, re-clarify that tweens should not have mutable stateMichael Merickel
2014-05-21Merge branch 'pull.1349'Michael Merickel
2014-05-21clarify tween thread-safetyMichael Merickel
2014-05-18Draw attention that tweens instances are unique and shared between threadsflibustenet
Forgetting that tween instance are not instantiated for each request leads to threads issues difficult to detect
2014-05-16update changelogMichael Merickel
2014-05-16Merge branch 'pull.1251'Michael Merickel
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-16Merge pull request #1346 from kpinc/doc_templatesMichael Merickel
Docs: narr/templates.rst: Link template bindings to pyramid docs.
2014-05-16Docs: narr/templates.rst: Link template bindings to pyramid docs.Karl O. Pinc
2014-05-16Merge pull request #1347 from krysros/masterSteve Piercy
fix typo
2014-05-16fix typokrysros
2014-05-16Merge pull request #1345 from kpinc/doc_templatesMichael Merickel
Docs: narr/templates.rst: Doc default extensions of each template system...
2014-05-16Docs: narr/templates.rst: Doc default extensions of each template system.Karl O. Pinc
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-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
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-25added line numbers to generic log formatterJohn Kraal
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