summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-06-09Merge pull request #1836 from Pylons/fix-1832-masterTres Seaver
Return concrete classes from 'pyramid.httpexceptions.exception_response'
2015-06-09Return concrete classes from 'pyramid.httpexceptions.exception_response'.Tres Seaver
The base classes are not appropriate for 400 and 500 status codes. See: #1832
2015-06-06Merge pull request #1831 from stevepiercy/masterSteve Piercy
cherry pick 1.6-branch to master
2015-06-06cherry pick 1.6-branch to masterSteve Piercy
2015-06-06Merge pull request #1829 from kissgyorgy/masterTres Seaver
More idiomatic Python
2015-06-06More idiomatic codeKiss György
2015-06-05We explicitly pass in the interfaces provided by the request asChris McDonough
request_iface to _call_view; we don't want _call_view to use request.request_iface, because render_view_to_response and friends are pretty much limited to finding views that are not views associated with routes, and the only thing request.request_iface is used for is to find route-based views. The render_view_to_response API is (and always has been) a stepchild API reserved for use of those who actually use traversal. Doing this fixes an infinite recursion bug introduced in Pyramid 1.6a1, and causes the render_view* APIs to behave as they did in 1.5 and previous. We should probably provide some sort of different API that would allow people to find views for routes. Fixes #1643.
2015-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-01Merge pull request #1823 from kilodalton/fixQuickTutorialDatabasesMichael Merickel
Quick Tutorial Database: Logging configs for db script output + fix scoped session warning
2015-06-01added name to contributors listKaren Dalton
2015-06-01add self.config = testing.setUp and testing.tearDown back to WikiViewTests ↵Karen Dalton
as it is a standard pattern for view tests
2015-06-01remove some calls to the testing module and self.config as they are not usedKaren Dalton
2015-06-01Add additional logging configs necessary for db script output and update ↵Karen Dalton
tests.py to fix the 'At least one scoped session' warning
2015-05-31Merge pull request #1817 from stevepiercy/masterSteve Piercy
- update testing and templating remarks
2015-05-31- update testing and templating remarksSteve Piercy
- grammar, punctuation, 79-column rewrapping, case corrections
2015-05-31Merge pull request #1816 from stevepiercy/masterSteve Piercy
move -E from Makefile to tox.ini so that we don't punish manual doc b…
2015-05-31move -E from Makefile to tox.ini so that we don't punish manual doc buildsSteve Piercy
2015-05-31Merge pull request #1815 from stevepiercy/masterSteve Piercy
add -E option to get tox to build docs and pass on jenkins
2015-05-31add -E option to get tox to build docs and pass on jenkinsSteve Piercy
2015-05-30Merge pull request #1814 from kissgyorgy/masterSteve Piercy
Added note on check_csrf view predicate
2015-05-30Added notes on check_csrf view predicate. Also it is an add_view parameter, ↵Kiss György
not add_route.
2015-05-28Merge pull request #1809 from stevepiercy/masterSteve Piercy
grammar, punctuation, caps, rewrap 79-columns
2015-05-28grammar, punctuation, caps, rewrap 79-columnsSteve Piercy
2015-05-28Merge pull request #1807 from stevepiercy/masterSteve Piercy
fix duplicate name resource_path
2015-05-28fix duplicate name resource_pathuralbash
2015-05-28Merge pull request #1803 from stevepiercy/masterSteve Piercy
grammar, punctuation
2015-05-28grammar, punctuationSteve Piercy
2015-05-27add an example decorator showing a response being used unconditionallyMichael Merickel
2015-05-27Merge pull request #1801 from stevepiercy/masterSteve Piercy
clean up and make consistent across wikis
2015-05-27clean up and make consistent across wikisSteve Piercy
2015-05-27Merge pull request #1796 from stevepiercy/masterSteve Piercy
- clean up and make consistent across wiki tutorials
2015-05-27- clean up and make consistent across wiki tutorialsSteve Piercy
- update templates and static assets for new design
2015-05-27Merge pull request #1795 from stevepiercy/masterSteve Piercy
- clean up and make consistent across both wikis authorization.rst
2015-05-27- clean up and make consistent across both wikis authorization.rstSteve Piercy
- update templates and static assets to new theme
2015-05-26Merge pull request #1790 from stevepiercy/masterSteve Piercy
- clean up and make defininingviews consistent between two wiki tutor…
2015-05-26- clean up and make defininingviews consistent between two wiki tutorialsSteve Piercy
- sort imports to be consistent with scaffold setup.py - update templates, static assets
2015-05-25Merge pull request #1788 from stevepiercy/masterSteve Piercy
update template and static assets to current
2015-05-25update template and static assets to currentSteve Piercy
2015-05-25Merge pull request #1783 from stevepiercy/masterSteve Piercy
update static assets, mytemplate.pt, caps
2015-05-25update static assets, mytemplate.pt, capsSteve Piercy
2015-05-25Merge pull request #1782 from stevepiercy/masterSteve Piercy
wikis consistency, grammar, wrapping
2015-05-25wikis consistency, grammar, wrappingSteve Piercy
2015-05-25Merge pull request #1777 from stevepiercy/masterSteve Piercy
grammar, caps, minor tweaks
2015-05-25grammar, caps, minor tweaksSteve Piercy
2015-05-25Merge pull request #1775 from stevepiercy/masterSteve Piercy
cherry pick from 1.5-branch
2015-05-25cherry pick from 1.5-branchSteve Piercy
2015-05-25Merge pull request #1770 from stevepiercy/masterSteve Piercy
mention ZODB; punctuation
2015-05-25mention ZODB; punctuationSteve Piercy
2015-05-25Merge pull request #1769 from stevepiercy/masterSteve Piercy
grammar
2015-05-25grammarSteve Piercy