summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-18Merge pull request #2517 from ↵Michael Merickel
mmerickel/fix/disable-csrf-on-exception-views-by-default disable csrf checking on all exception views unless explicitly turned on
2016-04-18disable csrf checking on all exception views unless explicitly turned onMichael Merickel
2016-04-17request.host_port is a str not an intDonald Stufft
2016-04-17fix csrf setting error messageMichael Merickel
2016-04-17Merge pull request #2515 from stevepiercy/masterSteve Piercy
update RELEASING.txt with "unreleased" heading
2016-04-17update RELEASING.txt with "unreleased" headingSteve Piercy
2016-04-17Merge pull request #2513 from stevepiercy/masterSteve Piercy
update RELEASING.txt to better account for master and previous branches
2016-04-17update RELEASING.txt to better account for master and previous branchesSteve Piercy
- add term "final" release - explicitify the implicit -
2016-04-17flip master to 1.8Michael Merickel
2016-04-17document view deriver optionsChris McDonough
2016-04-17better explain view deriver optionsChris McDonough
2016-04-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2016-04-17Merge pull request #2511 from stevepiercy/masterSteve Piercy
update RELEASING.txt with version terms, extra step
2016-04-17update RELEASING.txt with version terms, extra stepSteve Piercy
update conf.py with clearer comments and prep for rolldown for 1.6
2016-04-17Merge pull request #2510 from stevepiercy/1.7-branchSteve Piercy
update RELEASING.txt with version terms, extra step
2016-04-16update RELEASING.txt with version terms, extra stepSteve Piercy
update conf.py with clearer comments and prep for rolldown for 1.6
2016-04-16Back to devBert JW Regeer
2016-04-16Merge pull request #2509 from stevepiercy/1.7-branchSteve Piercy
replace ps1con with doscon for lexer and syntax highlighting
2016-04-16Merge pull request #2506 from stevepiercy/masterSteve Piercy
replace nose with pytest, clean up
2016-04-16Merge pull request #2507 from stevepiercy/masterSteve Piercy
replace ps1con with doscon for lexer and syntax highlighting
2016-04-16Merge pull request #2508 from stevepiercy/1.7-branchSteve Piercy
Merge pull request #2505 from stevepiercy/docs/quick-tour-gotcher-nose
2016-04-16Merge pull request #2505 from stevepiercy/docs/quick-tour-gotcher-noseSteve Piercy
Docs/quick tour gotcher nose
2016-04-16Merge pull request #2507 from stevepiercy/masterSteve Piercy
replace ps1con with doscon for lexer and syntax highlighting
2016-04-16replace ps1con with doscon for lexerSteve Piercy
2016-04-16Merge remote-tracking branch 'upstream/master'Steve Piercy
2016-04-16Merge pull request #2506 from stevepiercy/masterSteve Piercy
replace nose with pytest, clean up
2016-04-16Merge remote-tracking branch 'upstream/master'Steve Piercy
2016-04-16missed yer nose!Steve Piercy
2016-04-16replace nose with pytest, clean upSteve Piercy
2016-04-16Merge pull request #2505 from stevepiercy/docs/quick-tour-gotcher-noseSteve Piercy
Docs/quick tour gotcher nose
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup authorization.rst
2016-04-16prep 1.7a1Michael Merickel
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup authentication.rst
2016-04-16drop py27-only features at least temporarilyMichael Merickel
call me nostalgic
2016-04-16add docs and backward incompatibility notices for #2501Michael Merickel
2016-04-16fix format string to work on py26Michael Merickel
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup databases.rst
2016-04-16Merge pull request #2501 from dstufft/check-origin-csrfMichael Merickel
In addition to CSRF token, verify the origin too
2016-04-16In addition to CSRF token, verify the origin tooDonald Stufft
Add an additional layer of protection against CSRF by verifying the actual origin of the request in addition to the CSRF token. We only do this check on sites hosted behind HTTPS because only HTTPS sites have evidence to show that the Referrer header is not being spuriously removed by random middleware boxes.
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup forms.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup sessions.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup logging.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup more_view_classes.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup json.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup static_assets.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup jinja2.rst - add pyramid_jinja2 to requirements.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup routing.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup request_response.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup view_classes.rst
2016-04-16quick_tutorial cleanupSteve Piercy
- replace nose with pytest - cleanup templating.rst