summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bumped to 3.8.0 in preparation for next release.3.8.0Jason R. Coombs2015-06-264-4/+4
* Update changelogJason R. Coombs2015-06-261-0/+7
* Merged in alexlatchford/cherrypy (pull request #96)Joseph Tate2015-05-121-2/+4
|\
| * Remove old format of serialising stacktrace in favour of new APIAlex Latchford2015-05-111-1/+0
| * Include exc_info when calling loggerAlex Latchford2015-03-311-1/+4
* | Bumped to 3.7.1 in preparation for next release.Jason R. Coombs2015-04-244-4/+4
* | Added tag 3.7.0 for changeset 4aa828891193Jason R. Coombs2015-04-240-0/+0
* | Bumped to 3.7.0 in preparation for next release.3.7.0Jason R. Coombs2015-04-244-4/+4
* | Update changelogJason R. Coombs2015-04-241-0/+10
* | Allow cherrypy daemon to be launched with python -m cherrypyJason R. Coombs2015-04-241-0/+4
* | Move daemon code to daemon module and invoke from cherryd scriptJason R. Coombs2015-04-242-109/+111
* | Extract function for main body.Jason R. Coombs2015-04-241-1/+4
|/
* Improved wording about returned errorColin Svingen2015-03-191-2/+2
* Added details on specifying an index file.Colin Svingen2015-03-191-0/+19
* fixed #1361Lawouach2015-03-121-1/+1
* Backed out changeset: b7c4318a1fb9 Ref #1360Jason R. Coombs2015-03-101-7/+0
* Add test capturing failure. Ref #1360Jason R. Coombs2015-03-101-0/+7
* Remove unused importJason R. Coombs2015-03-101-2/+0
* Merged in nryoung/cherrypy (pull request #90)Sylvain Hellegouarch2015-02-235-9/+19
|\
| * Merged in alecz20/cherrypy/alecz20/basicsrst-edited-online-with-bitbucket--14...Sylvain Hellegouarch2015-01-270-0/+0
| |\
| * | basics.rst edited online with Bitbucket : fixed typo in favicon sample codeUnknown Name2015-01-271-1/+1
| |/
| * Fixed test_conn importing httplib, failing in Python3Gustavo Picon2015-01-261-2/+1
| * Removing useless comparisonGustavo Picon2015-01-241-1/+1
| * Monkeypatch the test sorter to always run test_gc last in each suite.Gustavo Picon2015-01-241-4/+15
| * Updated licensing dateSylvain Hellegouarch2015-01-131-1/+1
| * Merged in yoochan/cherrypy/yoochan/serverspy-edited-online-with-bitbucket-d-1...Sylvain Hellegouarch2015-01-061-1/+1
| |\
| | * servers.py edited online with Bitbucket (doctring of ServerAdapter corrected ...yoochan2015-01-061-1/+1
| |/
* | Fix several typos and grammar mistakes in the docs.Nic Young2014-12-292-6/+6
|/
* Merged in cavallo71/cherrypy/fix.https.message (pull request #86)Joel Rivera2014-12-181-1/+2
|\
| * fix the output message to show the correct scheme with ssl enabled servercavallo712014-09-121-1/+2
* | Merged in steve9000/cherrypy/steve9000/fix-put-request-it-wasnt-submitting-th...Joel Rivera2014-12-180-0/+0
|\ \
* | | Fix PUT request - it wasn't submitting the input field, only a blank stringUnknown Name2014-12-101-1/+1
|/ /
* | Fix #1298 for CPython 2.7 with the builtin ssl module and pyOpenSSL 0.14. How...Lawouach2014-12-071-2/+2
* | Merged in kevvvvv/cherrypy/kevvvvv/fix-broken-links-1417898285265 (pull reque...Sylvain Hellegouarch2014-12-061-2/+2
|\ \
| * | Fix broken linkskevvvvv2014-12-061-2/+2
|/ /
* | Bumped to 3.6.1 in preparation for next release.Jason R. Coombs2014-09-144-4/+4
* | Added tag 3.6.0 for changeset c8088a7e7502Jason R. Coombs2014-09-140-0/+0
* | Bumped to 3.6.0 in preparation for next release.3.6.0Jason R. Coombs2014-09-144-4/+4
* | Update changelogJason R. Coombs2014-09-131-0/+1
* | Merged in shroom/cherrypy (pull request #50)Jason R. Coombs2014-09-13227-7728/+9137
|\ \
| * | small typomnjonge2014-07-251-1/+1
| * | Update changelogJason R. Coombs2014-09-131-0/+13
| * | Merged in coady/cherrypy (pull request #71)Jason R. Coombs2014-09-13135-5969/+5589
| |\ \
| | * | Reorganize imports to conform to conventionJason R. Coombs2014-09-131-9/+11
| | * | Remove unused importsJason R. Coombs2014-09-131-2/+0
| | * | Merged in MichielOvertoom/cherrypycustomlogging (pull request #38)Jason R. Coombs2014-09-132-0/+21
| | |\ \
| | | * | Custom logging: hostnameMichiel Overtoom2013-03-302-0/+21
| | * | | Extract message to perform debug messagesJason R. Coombs2014-09-131-23/+16
| | * | | Extract variable for nicer indentationJason R. Coombs2014-09-131-7/+8
| | * | | Merge with cherrypy-3.2.xJason R. Coombs2014-09-131-1/+2
| | |\ \ \ | | | |_|/ | | |/| |