summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-07-02dont need to use any settings, we include pyramid_jinja2 in mainChris McDonough
2014-07-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-06-20Merge pull request #1365 from frewsxcv/patch-1Tres Seaver
2014-06-19Enable automated testing with Python 3.4Corey Farwell
2014-06-05- Work around a bug introduced in Python 2.7.7 on Windows whereChris McDonough
2014-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-06-04Merge pull request #1359 from george2/patch-1Michael Merickel
2014-06-04Scaffold templates: close more ul tags.george
2014-06-04Scaffold template: close an ul tag.george2
2014-06-01fix inclusion of README.rst in the package descriptiongoodwillcoding
2014-05-25Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-25Bring in #1352Steve Piercy
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
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
2014-05-16Merge pull request #1346 from kpinc/doc_templatesMichael Merickel
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
2014-05-16fix typokrysros
2014-05-16Merge pull request #1345 from kpinc/doc_templatesMichael Merickel
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
2014-05-13Update hooks.rstsynthomat
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
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
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
2014-05-03- add a referenceSteve Piercy
2014-05-03Merge pull request #1332 from stevepiercy/masterSteve Piercy
2014-05-03- looks like _ are now - in RTDSteve Piercy
2014-05-03Merge pull request #1331 from stevepiercy/masterSteve Piercy
2014-05-03- add cookbook to intersphinx mappingSteve Piercy
2014-05-03Merge pull request #1330 from stevepiercy/masterSteve Piercy
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-19 18:40:05 +0000