summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-03-13remove stray backtickSteve Piercy
2018-03-09Merge pull request #3235 from heron182/3195_cherrypy_importTres Seaver
2018-03-09Not a backward-incompatibility for Pyramid.Tres Seaver
2018-03-09Fix invalid string in feature rephrasingHeron Rossi
2018-03-09Rephrasing feature changeHeron Rossi
2018-03-09Merge branch 'master' of github.com:Pylons/pyramid into 3195_cherrypy_importHeron Rossi
2018-03-09Adding entry on CHANGES.txtHeron Rossi
2018-03-08Merge pull request #3236 from Pylons/changes-as-rstMichael Merickel
2018-03-08Accomodate file renames in release instructions.Tres Seaver
2018-03-08Fixing another import path regarding cherrypy version changeHeron Rossi
2018-03-08Mark changelogs as ReST, for better Github rendering.Tres Seaver
2018-03-08Fixing formatting and import errorsHeron Rossi
2018-03-08Adjusting cherrypy WSGI Server import path according to new releaseHeron Rossi
2018-02-26fix broken linkMichael Merickel
2018-01-28Merge pull request #3224 from stevepiercy/masterSteve Piercy
2018-01-28Remove `html_use_smartypants` setting because RTD now uses Sphinx 1.6.5Steve Piercy
2018-01-24Merge pull request #3221 from di/subrequest-doc-fixSteve Piercy
2018-01-24Emphasize additional lineDustin Ingram
2018-01-16Merge pull request #3217 from stevepiercy/masterSteve Piercy
2018-01-12Update templates to align with cookiecuttersSteve Piercy
2018-01-11Merge pull request #3215 from stevepiercy/masterSteve Piercy
2018-01-11Align project name with source files myproject/*.iniSteve Piercy
2017-12-01Merge pull request #3208 from stevepiercy/masterSteve Piercy
2017-12-01Clarify when and how waitress is installed.Steve Piercy
2017-11-25Merge pull request #3205 from Pylons/revert-3204-patch-2Steve Piercy
2017-11-25Revert "setup.py: add waitress requirement"Steve Piercy
2017-11-25Merge pull request #3204 from silum/patch-2Tres Seaver
2017-11-25setup.py: add waitress requirementsilum
2017-11-16Merge pull request #3203 from tjwudi/patch-3Steve Piercy
2017-11-16Update factories.pyJohn Wu
2017-11-15Clarify property descriptor in add_request_methodJohn Wu
2017-11-10Merge pull request #3201 from tjwudi/patch-2Steve Piercy
2017-11-10Fix typeJohn Wu
2017-11-09Merge pull request #3199 from tjwudi/patch-1Tres Seaver
2017-11-09Minor fix - Indentation issueJohn Wu
2017-11-04Merge pull request #3196 from silum/patch-1Steve Piercy
2017-11-03CONTRIBUTORS.txt: add my namesilum
2017-11-03views.py: prevent exception on unknown user loginsilum
2017-11-03views.py: prevent exception on unknown user loginsilum
2017-10-29Merge pull request #3192 from stevepiercy/masterSteve Piercy
2017-10-29fix lintMichael Merickel
2017-10-28Synch source files with cookiecutterSteve Piercy
2017-10-22Merge branch 'pr/3140'Michael Merickel
2017-10-22changelog for #3140Michael Merickel
2017-10-22Merge pull request #3188 from stevepiercy/masterSteve Piercy
2017-10-22Move Quick Tutorial under TutorialsSteve Piercy
2017-10-22Merge pull request #3180 from shentonfreude/feature/GH#2926_quick_tutorial_ws...Steve Piercy
2017-10-22Merge pull request #3183 from Pylons/fix-pypyMichael Merickel
2017-10-22fix pypy by using a specific versionMichael Merickel
2017-10-21Changes per stevepiercy review, thanks!Chris Shenton