summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-19changelog for #2750Michael Merickel
2016-09-19Merge branch 'pr/2750'Michael Merickel
2016-09-19clarify #2750 a bit furtherMichael Merickel
2016-09-12changelog for #2764Michael Merickel
2016-09-12Merge branch 'fix/1549'Michael Merickel
2016-09-12document more clearly the ``__call__`` method on route and view predicatesMichael Merickel
fixes #1549
2016-09-12Merge pull request #2759 from mmerickel/drop-py33Michael Merickel
drop support for python 3.3 and error on 2.6
2016-09-05Merge pull request #2761 from mmerickel/feature/default-tweensMichael Merickel
refactor tween initialization to occur at config-time
2016-09-04refactor tween initialization to occur at config-timeMichael Merickel
previously the EXCVIEW tween was only created in the router OR when another tween is added. Now the EXCVIEW tween is just added at startup similar to how view derivers and many other things operate.
2016-09-03update docs to support the bootstrap context manager from #2760Michael Merickel
2016-09-03changelog for #2760Michael Merickel
2016-09-03Merge branch 'feature/with-bootstrap'Michael Merickel
2016-09-03changelog for #2757Michael Merickel
2016-09-03Merge branch 'fix/reentrant-deferred-discriminators'Michael Merickel
2016-09-03allow prepare/bootstrap to be used as a context managerMichael Merickel
closes #1822
2016-09-01Merge pull request #3 from stevepiercy/mmerickel-drop-py33Michael Merickel
clean up HACKING and RELEASING for 1.8
2016-09-01One more for 2.6Steve Piercy
2016-09-01clean up HACKING and RELEASING for 1.8Steve Piercy
2016-09-01drop support for python 3.3 and error on 2.6Michael Merickel
closes #2476
2016-08-31reference pull request for #2662Michael Merickel
2016-08-31Merge branch 'canni-extract_http_basic'Michael Merickel
2016-08-31rename the credentials classMichael Merickel
2016-08-31Merge branch 'extract_http_basic' of canni/pyramid into canni-extract_http_basicMichael Merickel
2016-08-31ref the pull request for #2615 in the changelogMichael Merickel
2016-08-31silence the warning generated by #2715 in the test suiteMichael Merickel
2016-08-31add changelog for #2715Michael Merickel
2016-08-31Merge pull request #2715 from Pylons/bugfix/authtkt_bad_cookieMichael Merickel
Fix AuthTktCookieHelper so that it doesn't create bad cookies
2016-08-31add changelog for #2714Michael Merickel
2016-08-31Merge pull request #2714 from Pylons/bugfix/proutes_re_splitMichael Merickel
re.split() requires non-empty match
2016-08-31re-enable support for resolving conflicts across ordersMichael Merickel
This feature was silently dropped in Pyramid 1.4 when deferred discriminators were added. It is re-introduced such that it's possible to override an action in order X by defining an action in order Y where Y <= X with a non-conflicting includepath. This also takes special care to avoid undeferring the discriminator for an action until the execution engine is ready to start executing actions of the same order. This gives time for required actions to execute prior, allowing the discriminator to depend on earlier actions. fixes #2697
2016-08-31add extra tests for testing action discriminators across ordersMichael Merickel
2016-08-31add test cases to reproduce #2697Michael Merickel
2016-08-20Merge pull request #2754 from stevepiercy/masterSteve Piercy
add testing for py36
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-18Merge pull request #2752 from stevepiercy/masterSteve Piercy
update output for pcreate --list in Quick Tutorial
2016-08-18update output for pcreate --list in Quick TutorialSteve Piercy
2016-08-17Clarify that headers are ADDED to the responseMark Jones
Make it clear that headers are added to the response instead of overwriting existing headers. Explain how to set the content_type instead of just assuming they will know.
2016-08-16Merge pull request #2745 from mmerickel/fix/2744Michael Merickel
revert changes to the renderers from #2706
2016-08-16Fix #2744 by reverting #2706Michael Merickel
This reverts commit c7d8f6515d4b154c4a4cf2cbaac9789fbcd19282. This reverts commit 0dcd259c0263c14e8c51d9e204c1419daffbd2ce. This reverts commit 412ed2e1988e2fd70d02e4176c9c9c7855b0093c.
2016-08-15Merge pull request #2742 from stevepiercy/masterSteve Piercy
Fix up URLs to include default language and reduce verbosity
2016-08-15Fix up URLs to include default language and reduce verbositySteve Piercy
(cherry picked from commit d6b2c66)
2016-08-15Merge pull request #2739 from stevepiercy/masterSteve Piercy
update output of pcreate --list for Quick Tour
2016-08-15update output of pcreate --list for Quick TourSteve Piercy
2016-08-15fix alchemy scaffold help textMichael Merickel
2016-08-11Add this feature to chenges & small improvementDariusz Górecki
2016-08-10Add docs & explict testsDariusz Górecki
2016-08-10Merge branch 'master' into extract_http_basicDariusz Górecki
2016-07-30Merge pull request #2730 from stevepiercy/masterSteve Piercy
forward port docs fixes from 1.7-branch