aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Declare & define insufficient_privChris Czub2015-10-291-0/+1
* Better error handling/reporting for pfctl failures on OS XChris Czub2015-10-291-2/+9
* Merge pull request #791 from tunz/masterMaximilian Hils2015-10-281-2/+2
|\
| * Refresh flowview instead of reopen the same flowviewChoongwoo Han2015-10-081-4/+2
| * Prevent flowview from creating duplicated windowsChoongwoo Han2015-10-041-0/+2
* | Merge pull request #805 from Badg/patch-1Maximilian Hils2015-10-231-1/+1
|\ \
| * | Ubuntu install missing libjpeg8-dev, zlib1g-devNick Badger2015-10-221-1/+1
| * | Update ubuntu installation to includ libjpegNick Badger2015-10-221-1/+1
|/ /
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-10-221-1/+1
|\ \
| * \ Merge pull request #801 from ben-lerner/doc_fixMaximilian Hils2015-10-141-1/+1
| |\ \
| | * | doc typo fixBen Lerner2015-10-131-1/+1
| |/ /
* / / fix #800Maximilian Hils2015-10-221-1/+2
|/ /
* | update web builds, use watchifyMaximilian Hils2015-10-0821-4510/+5852
* | Merge pull request #797 from colinbendell/colinbendell-patch-1Maximilian Hils2015-10-081-2/+2
|\ \
| * | default should not be NoneColin Bendell2015-10-071-1/+1
| * | Check if server connection hasn't yet been initiatedColin Bendell2015-10-071-2/+2
|/ /
* | Merge pull request #792 from tunz/patch-1Maximilian Hils2015-10-041-1/+1
|\ \ | |/ |/|
| * Update CONTRIBUTING.mdChoongwoo Han2015-10-041-1/+1
|/
* Merge remote-tracking branch 'origin/master'Maximilian Hils2015-10-031-1/+1
|\
| * Merge pull request #788 from sethp-jive/patch-1Maximilian Hils2015-10-011-1/+1
| |\
| | * Allow reading scripts from an anonymous pipesethp-jive2015-09-301-1/+1
| |/
* / fix #786Maximilian Hils2015-10-031-0/+5
|/
* fix #773Maximilian Hils2015-09-282-4/+19
* fix testsMaximilian Hils2015-09-281-1/+1
* Merge branch 'http-models'Maximilian Hils2015-09-2818-206/+136
|\
| * move tests to netlibMaximilian Hils2015-09-271-79/+0
| * adjust to netlib response changes + docsMaximilian Hils2015-09-2612-57/+58
| * adjust to netlib request changes + docsMaximilian Hils2015-09-2612-73/+81
* | handle Expect: 100-continue header, fix #770Maximilian Hils2015-09-285-5/+54
|/
* fix testsMaximilian Hils2015-09-212-1/+2
* appveyor: use py.testMaximilian Hils2015-09-211-1/+1
* experimental: run tests using py.testsMaximilian Hils2015-09-2111-15/+19
* fix minor bugs, add py.test compatibilityMaximilian Hils2015-09-216-74/+32
* fix replay functionalityMaximilian Hils2015-09-191-4/+4
* don't cache changed messages, fix #777Maximilian Hils2015-09-191-2/+3
* fix #778Maximilian Hils2015-09-192-3/+3
* experimental: don't interfere with headers, fix #93Maximilian Hils2015-09-187-46/+40
* trigger inline script hooks for artifical responses, fix #775Maximilian Hils2015-09-181-10/+11
* remove old server replay workaround, fix #774Maximilian Hils2015-09-181-5/+1
* code -> status_code, httpversion -> http_versionMaximilian Hils2015-09-1716-63/+62
* move body assembly to netlibMaximilian Hils2015-09-171-11/+2
* use new netlib exceptionsMaximilian Hils2015-09-1712-53/+40
* Merge pull request #768 from mitmproxy/netlib-http1-refactorMaximilian Hils2015-09-1623-251/+206
|\
| * adjust to netlib changesMaximilian Hils2015-09-1623-251/+206
* | s/below/above/Maximilian Hils2015-09-161-1/+1
* | simplify test scriptMaximilian Hils2015-09-161-2/+2
* | make pypi happyMaximilian Hils2015-09-161-7/+5
* | improve readmeMaximilian Hils2015-09-166-118/+162
* | Merge pull request #751 from mitmproxy/readthedocsMaximilian Hils2015-09-16144-9069/+2560
|\ \ | |/ |/|
| * docs: add travis integrationMaximilian Hils2015-09-081-4/+5
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 19:14:27 +0000