aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix reply concurrencyMaximilian Hils2016-08-041-2/+22
|
* fix testsMaximilian Hils2016-08-044-4/+2
|
* minor improvementsMaximilian Hils2016-08-042-1/+2
|
* simplify contentview logicMaximilian Hils2016-08-046-125/+127
|
* Update install.rstMaximilian Hils2016-08-021-1/+1
|
* fix #1465, fix ssl_insecureMaximilian Hils2016-08-023-8/+16
|
* Revert "Add missing ssl_insecure option"Maximilian Hils2016-08-021-1/+0
| | | | This reverts commit 1d33d76bfd489e51c63f1e5075c83c2be81fd56a.
* Merge pull request #1463 from dufferzafar/options-hotfixThomas Kriechbaumer2016-08-021-0/+1
|\ | | | | Add missing ssl_insecure option
| * Add missing ssl_insecure optionShadab Zafar2016-08-021-0/+1
|/
* Merge pull request #1457 from mkagenius/interger_divisionThomas Kriechbaumer2016-08-011-1/+1
|\ | | | | integer division for python 3 compatibility
| * integer division for python 3 compatibilityManish Kumar2016-08-011-1/+1
|/
* Merge pull request #1453 from dufferzafar/limit-to-filterMaximilian Hils2016-07-319-37/+37
|\ | | | | Rename "Limit" feature to "Filter View"
| * Rename "Limit" feature to "Filter View"Shadab Zafar2016-07-319-37/+37
| |
* | Merge pull request #1447 from mitmproxy/secure-by-defaultAldo Cortesi2016-08-0125-231/+303
|\ \ | | | | | | Verify upstream certificates by default
| * | fix cert verification tests, remove leftoversMaximilian Hils2016-07-2711-165/+209
| | |
| * | improve invalid certificate uxMaximilian Hils2016-07-279-50/+70
| | |
| * | verify upstream certificates by default (#1111)Sachin Kelkar2016-07-278-44/+52
| | | | | | | | | | | | squashed and merged by @mhils
* | | Merge pull request #1449 from mhils/fix-1448Maximilian Hils2016-07-304-7/+12
|\ \ \ | | | | | | | | Add escape_single_quotes=False arg to bytes_to_escaped_str
| * | | add escape_single_quotes=False arg to bytes_to_escaped_strMaximilian Hils2016-07-294-7/+12
| | |/ | |/|
* | | Merge pull request #1451 from YanchWare/masterMaximilian Hils2016-07-306-4/+30
|\ \ \ | | | | | | | | Integrated encode/decoder for brotli
| * | | Integrated encode/decoder for brotliAngelo Agatino Nicolosi2016-07-306-4/+30
| |/ /
* | | Merge pull request #1450 from vhaupert/masterMaximilian Hils2016-07-302-1/+3
|\ \ \ | |/ / |/| | Fix platform import, substitute "~" with user's home
| * | Substitute tilde with user's home.Vincent Haupert2016-07-301-0/+1
| | | | | | | | | | | | | | | | | | When downloding the mitmproxy certificate using mitm.it, '~' currently is not expanded causing a FileNotFoundException. This patch uses expanduser() to replace the initial tilde with the user's home.
| * | Fix platform import on Linux using python3Vincent Haupert2016-07-301-1/+2
|/ / | | | | | | | | Using python3, sys.platform returns "linux" instead of "linux2" using python2. This patch accepts "linux" as well as "linux2".
* | minor fixesMaximilian Hils2016-07-293-6/+6
| |
* | clean up release tool, build linux binariesMaximilian Hils2016-07-294-188/+168
| |
* | Merge pull request #1436 from dufferzafar/jsbeautifierMaximilian Hils2016-07-2811-1586/+20
|\ \ | | | | | | Use jsbeautifier from pip
| * | Use replace while decodingdufferzafar2016-07-282-5/+8
| | |
| * | Set upper bound on jsbeautifier package to 1.7dufferzafar2016-07-281-1/+1
| | |
| * | Use strutils.native before sending data to jsbeautifierdufferzafar2016-07-271-1/+1
| | |
| * | Re-order imports etc.dufferzafar2016-07-271-17/+11
| | |
| * | Remove jsbeautifier filesdufferzafar2016-07-278-1564/+0
| | |
| * | Make contentview requirements mandatorydufferzafar2016-07-271-2/+2
| | |
| * | Use jsbeautifier from pipdufferzafar2016-07-272-2/+3
| | |
* | | minor fixesMaximilian Hils2016-07-272-3/+4
| |/ |/|
* | Merge pull request #1446 from cortesi/stateAldo Cortesi2016-07-282-1/+18
|\ \ | | | | | | console: add replace_view_state, fix statusbar issues
| * | console: add replace_view_state, fix statusbar issuesAldo Cortesi2016-07-282-1/+18
| | | | | | | | | | | | Fixes #1394
* | | Merge pull request #1442 from cortesi/scriptsAldo Cortesi2016-07-281-0/+1
|\| | | | | | | | mitmdump: send script .done when terminating after flow read
| * | mitmdump: send script .done when terminating after flow readAldo Cortesi2016-07-281-0/+1
| | | | | | | | | | | | Fixes #1439
* | | Merge pull request #1406 from gzzhanghao/fix36Maximilian Hils2016-07-277-19/+52
|\ \ \ | | | | | | | | [web] Update view with sortedUpdate
| * | | [web] change test filesJason2016-07-278-7/+1
| | | |
| * | | [web] bug fix and add testJason2016-07-264-13/+37
| | | |
| * | | [web] fix: Flow update changes list order #36Jason2016-07-241-10/+25
| | | |
* | | | add favicon to mitmweb (#1440)Clemens Brunner2016-07-274-2/+4
| |_|/ |/| |
* | | update dependencies (#1435)Maximilian Hils2016-07-253-5/+5
| | |
* | | restrict accepted lxml versions to fix buildsMaximilian Hils2016-07-251-1/+1
| | |
* | | fix #1432Maximilian Hils2016-07-251-2/+8
| | |
* | | Merge pull request #1428 from dufferzafar/replayAldo Cortesi2016-07-262-22/+33
|\ \ \ | |_|/ |/| | Consolidate replay under R
| * | Consolidate replay under RShadab Zafar2016-07-252-22/+33
| | |
* | | Merge pull request #1427 from mhils/grideditorAldo Cortesi2016-07-269-728/+884
|\ \ \ | | | | | | | | Refactor GridEditor