summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-30correct view nameSteve Piercy
2015-04-26add pylons_sphinx_latesturl to the docs extrasMichael Merickel
2015-04-26update rtd.txt to just load deps from docs extrasMichael Merickel
2015-04-26allow dots in the jsonp callback and prefix content with a commentMichael Merickel
The comment prefix should potential exploints from flash plugins (See CVE-2014-4671 "Rosetta Flash").
2015-04-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-20update development.ini in scaffolds to listen on 127.0.0.1Michael Merickel
2015-04-20Merge pull request #1642 from Taar/alchemy_scaffold_updateMichael Merickel
Adding myself to the contributors list
2015-04-20Adding myself to the contributors listRandy Topliffe
2015-04-20Merge branch 'alchemy_scaffold_update' of Taar/pyramidMichael Merickel
2015-04-20Update CONTRIBUTORS.txtTimur Izhbulatov
2015-04-20rearrange tox.iniMichael Merickel
2015-04-19fix some style issuesMichael Merickel
2015-04-19Merge branch 'configurable-view-deriver' of caseman/pyramid into ↵Michael Merickel
feature/configurable-view-deriver
2015-04-19Merge pull request #1627 from bertjwregeer/security/jsonpMichael Merickel
Add some validation for the JSONP callback
2015-04-19Merge branch 'pr/1571'Michael Merickel
2015-04-19touch up pr 1571Michael Merickel
2015-04-19add epub to docs and specify a env-specific build dir for docsMichael Merickel
2015-04-17default response_callback and finished_callback to an empty deque instead of ↵Michael Merickel
None fixes #1600
2015-04-17Added support for a prefixed base url to not contain a trailing slashCharlie Choiniere
2015-04-16Merge pull request #1636 from stevepiercy/masterSteve Piercy
replace git submodule with new pylons-sphinx-themes package
2015-04-16- update sphinx makefileSteve Piercy
- git submodule deinit . - replace git submodule with new pylons-sphinx-themes package. See #1614, #1596
2015-04-16Merge pull request #1635 from stevepiercy/masterSteve Piercy
try to get RTD to build
2015-04-16try to get RTD to buildSteve Piercy
2015-04-16Merge pull request #1634 from stevepiercy/masterSteve Piercy
Replace git submodule crap with new pylons-sphinx-themes package goodnes...
2015-04-16Replace git submodule crap with new pylons-sphinx-themes package goodness. ↵Steve Piercy
See #1614.
2015-04-16Tests for adding view derivationsCasey Duncan
2015-04-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-15Merge pull request #1633 from dairiki/bug.temporary_responseMichael Merickel
Restore request.response after render_to_response if renderer raises exception
2015-04-15Add pylonshq and pylonsrtd items to updateSteve Piercy
2015-04-15Finish porting original view deriver testsCasey Duncan
2015-04-15Restore request.response if renderer raises exceptionJeff Dairiki
This fixes two bugs in the ``temporary_response`` context manager: - ``Request.response`` should be restored even if the renderer raises an exception - If ``request.response`` is initially set to ``None``, it should be restored to ``None`` (rather than deleted). References: #1563
2015-04-15Add tests for temporary_response context managerJeff Dairiki
These tests test for, among other things, the nits described in comments on #1563, namely: - ``Request.response`` should be restored even if the renderer raises an exception - If ``request.response`` is initially set to ``None``, it should be restored to ``None`` (rather than deleted). (Some of these tests currently fail.)
2015-04-15start of fixing test.Amos Latteier
2015-04-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into ↵Amos Latteier
configurable-view-deriver
2015-04-15Fix some tests that had bad capitalization, and fix a missing import.Amos Latteier
2015-04-15fix more derivation testsCasey Duncan
2015-04-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into ↵Casey Duncan
configurable-view-deriver
2015-04-15moar deriver test fixesCasey Duncan
2015-04-15Fix package name in tests.Amos Latteier
2015-04-15wip factor out deriver testsCasey Duncan
2015-04-15Add missed view deriver.Amos Latteier
Remove unneed config command in test.
2015-04-15Store derivers in registry, not config, since new configs are created ↵Amos Latteier
(losing state).
2015-04-15Merge pull request #1632 from tisdall/master-docupdateMichael Merickel
mention adding links in whatsnew for minor revs
2015-04-15Merge branch '1.6-branch'Chris McDonough
2015-04-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-15meta related to whatsnew changingChris McDonough
2015-04-15Merge branch 'configurable-view-deriver' of github.com:caseman/pyramid into ↵Casey Duncan
configurable-view-deriver
2015-04-15add default view derivations to configurator in testing.setUp()Casey Duncan
2015-04-15mention adding links in whatsnew for minor revsTim Tisdall
2015-04-15Add missing imports.Amos Latteier