summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-25Merge pull request #2530 from stevepiercy/masterBert JW Regeer
Allow Sphinx doctests to run and pass with `make doctest SPHINXBUILD=$VENV/bin/sphinx-build`
2016-04-25put doctest into make commandSteve Piercy
2016-04-24add doctest to tox.ini [docs] environmentSteve Piercy
2016-04-24add sphinx doctests for hooks.rstSteve Piercy
2016-04-24remove file for testingSteve Piercy
2016-04-24Allow Sphinx doctests to run and pass with `make doctest ↵Steve Piercy
SPHINXBUILD=$VENV/bin/sphinx-build`. - TODO: two tests in `docs/narr/hooks.rst`
2016-04-24Merge pull request #2528 from stevepiercy/masterSteve Piercy
update bad link
2016-04-24update bad linkSteve Piercy
2016-04-24Merge pull request #2526 from stevepiercy/masterSteve Piercy
Use parsed-literal for installing versions of Pyramid. This should fu…
2016-04-24Use parsed-literal for installing versions of Pyramid. This should future ↵Steve Piercy
proof docs.
2016-04-23Merge pull request #2523 from int3l/masterTres Seaver
import/docstring adjustments in decorator module
2016-04-23Merge pull request #2524 from stevepiercy/masterSteve Piercy
Fix all the stinky linkie rot via `make linkcheck SPHINXBUILD=$VENV/b…
2016-04-23Fix all the stinky linkie rot via `make linkcheck ↵Steve Piercy
SPHINXBUILD=$VENV/bin/sphinx-build`, but don't bother with HISTORY.txt or whatsnew-xx
2016-04-23adjustment and update docstring to be consistantint3l
2016-04-23import/docstring adjustments in decorator moduleint3l
2016-04-19Merge pull request #2521 from stevepiercy/masterSteve Piercy
Fix what's new links in templates with "-branch" in RELEASING.txt
2016-04-19Fix what's new links in templates with "-branch" in RELEASING.txtSteve Piercy
2016-04-19drop unsupported test endpointsMichael Merickel
2016-04-19Merge branch 'pr/2520' into feature/appveyor-ciMichael Merickel
2016-04-19test appveyor.ymlMichael Merickel
2016-04-19remove vestiges of pyramid.require_default_csrfMichael Merickel
2016-04-19Merge pull request #2518 from mmerickel/feature/set-default-csrf-optionsMichael Merickel
replace pyramid.require_default_csrf setting with config.set_default_csrf_options
2016-04-19Make tests pass under WindowsChristoph Zwerschke
2016-04-19Merge remote-tracking branch 'refs/remotes/Pylons/master'Christoph Zwerschke
2016-04-19replace pyramid.require_default_csrf setting with ↵Michael Merickel
config.set_default_csrf_options
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