summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-20re-moving unnecessary hyphenation (see what I did there?)Steve Piercy
2015-05-16Merge pull request #1682 from stevepiercy/masterSteve Piercy
replace image with ASCII tree diagram
2015-05-16- replace image with ASCII tree diagramSteve Piercy
- make venv name generic without a version to reduce future maintenance
2015-05-16Merge pull request #1681 from stevepiercy/masterSteve Piercy
cherrypick from 1.6
2015-05-16cherrypick from 1.5Steve Piercy
2015-05-16Merge pull request #1676 from stevepiercy/masterSteve Piercy
grammar fix
2015-05-16grammar fixSteve Piercy
2015-05-16Merge pull request #1673 from stevepiercy/masterSteve Piercy
grammar fix
2015-05-16grammar fixSteve Piercy
2015-05-11Update authorization.rstAreski Belaid
fix the url for hello route '/howdy'
2015-05-08Merge pull request #1665 from stevepiercy/masterSteve Piercy
Fixed minor highlighting mistake.
2015-05-08Fixed minor highlighting mistake.Florian Klemme
There was just an apostrophe missing.
2015-05-06Merge pull request #1659 from stevepiercy/masterSteve Piercy
bump and unpin versions. RTD uses Sphinx 1.3.1 now.
2015-05-06bump and unpin versions. RTD uses Sphinx 1.3.1 now.Steve Piercy
2015-04-30Update logging.rstAreski Belaid
The point 5 from this tutorial http://docs.pylonsproject.org/projects/pyramid/en/latest/quick_tutorial/logging.html mention that we should see a debug message. This appears before any needed changes in `development.ini`, thus this patch intend to change the order and add an extra point to put forward changes in the ini file.
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-20update development.ini in scaffolds to listen on 127.0.0.1Michael Merickel
2015-04-20rearrange tox.iniMichael Merickel
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-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-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-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-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-15mention adding links in whatsnew for minor revsTim Tisdall
2015-04-15Merge pull request #1631 from tisdall/1.6-docupdateMichael Merickel
typo
2015-04-15typoTim Tisdall
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15update releasing.txt to use twine/wheelsMichael Merickel
2015-04-15master is now 1.7Chris McDonough
2015-04-15Merge branch '1.6-branch'Chris McDonough
2015-04-14Merge branch 'master' into 1.6-branchChris McDonough
2015-04-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-14prep for 1.6a1Chris McDonough