aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2509 from ujjwal96/compatMaximilian Hils2017-08-091-1/+1
|\
| * Fixes #2495Ujjwal Verma2017-08-101-1/+1
* | Merge pull request #2504 from MatthewShao/static-viewerMaximilian Hils2017-08-0815-31/+90
|\ \ | |/ |/|
| * [web] Minor fixes.Matthew Shao2017-08-082-5/+0
| * [web] Remove activeFetches and onMessage in StaticBackend.Matthew Shao2017-08-081-19/+1
| * [web] Remove MITMWEB_STATIC var in tests, and update them.Matthew Shao2017-08-084-29/+13
| * [web] update HideInStatic and some components.Matthew Shao2017-08-085-8/+20
| * [web] Update react,react-dom,react-test-renderer to 16-beta.3Matthew Shao2017-08-082-15/+15
| * [web] Update tests to ensure they won't be disturbed by static modeMatthew Shao2017-08-073-13/+19
| * [web] Add HideInStatic ComponentMatthew Shao2017-08-076-13/+32
| * [web] Add static backend.Matthew Shao2017-08-072-1/+60
| * [web] Add static.js to index.html, containing MITMWEB_STATIC var.Matthew Shao2017-08-072-0/+2
* | Merge pull request #2502 from mhils/optmanagerMaximilian Hils2017-08-072-3/+13
|\ \
| * | fix optmanager equality check and deepcopyMaximilian Hils2017-08-052-3/+13
* | | Merge pull request #2503 from ujjwal96/optionsMaximilian Hils2017-08-073-2/+196
|\ \ \
| * | | Improve options UXUjjwal Verma2017-08-073-2/+196
* | | | Merge pull request #2492 from mhils/addon-containsMaximilian Hils2017-08-053-8/+26
|\ \ \ \
| * | | | gracefully handle errors during script loadMaximilian Hils2017-08-053-8/+26
| |/ / /
* | | | Merge pull request #2501 from mhils/toxxMaximilian Hils2017-08-051-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | use py36 where possibleMaximilian Hils2017-08-051-2/+2
|/ / /
* | | Merge pull request #2500 from mitmproxy/add-http2-switchMaximilian Hils2017-08-051-0/+1
|\ \ \
| * | | re-add --http2 switchMaximilian Hils2017-08-051-0/+1
|/ / /
* | | Merge pull request #2494 from ujjwal96/intercept-toggleThomas Kriechbaumer2017-08-042-3/+5
|\ \ \
| * | | Improve intercept toggleUjjwal Verma2017-08-022-3/+5
| |/ /
* | | Merge pull request #2499 from mhils/rawtcpMaximilian Hils2017-08-042-4/+14
|\ \ \
| * | | Revert "Remove promotion to raw TCP based on heuristics"Maximilian Hils2017-08-031-1/+10
| * | | improve docstring for rawtcpMaximilian Hils2017-08-031-3/+4
|/ / /
* | | Merge pull request #2475 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-08-021-2/+2
|\ \ \
| * | | [requires.io] dependency updaterequires.io2017-08-021-2/+2
|/ / /
* | | Merge pull request #2496 from Kriechi/bump-pyasnThomas Kriechbaumer2017-08-022-6/+4
|\ \ \
| * | | bump dependencyThomas Kriechbaumer2017-08-021-1/+1
| * | | update for pyasn1 0.3Ujjwal Verma2017-08-021-5/+3
|/ / /
* | | Merge pull request #2493 from Kriechi/improve-testsMaximilian Hils2017-08-021-188/+233
|\ \ \
| * | | improve proxyauth testsThomas Kriechbaumer2017-08-021-188/+233
|/ / /
* | | Merge pull request #2490 from mitmproxy/issue-2334Maximilian Hils2017-08-011-1/+1
|\ \ \ | |/ / |/| |
| * | Update proxyauth.pyMaximilian Hils2017-08-011-1/+1
* | | fix mitmproxy invocationMaximilian Hils2017-08-011-1/+1
|/ /
* | add LogEntry.__eq__Maximilian Hils2017-08-012-0/+10
* | Merge pull request #2487 from mhils/no-option-processingMaximilian Hils2017-08-019-14/+20
|\ \
| * | remove OptManager._processedMaximilian Hils2017-07-319-14/+20
* | | Merge pull request #2488 from MatthewShao/options-into-own-addonMaximilian Hils2017-07-311-1/+1
|\ \ \
| * | | Fix minor typing mistake.Matthew Shao2017-07-311-1/+1
|/ / /
* | / Merge pull request #2484 from mhils/options-into-own-addonMaximilian Hils2017-07-3127-170/+183
|\| | | |/ |/|
| * minor fixesMaximilian Hils2017-07-302-5/+5
| * move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
| * fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| * fix tool-specific cmdlineMaximilian Hils2017-07-304-30/+34
| * disentangle ProxyServer and Master classes.Maximilian Hils2017-07-3023-121/+130
| * move web options into their own addonMaximilian Hils2017-07-293-19/+20
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-302-1/+20
|\ \