Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Closes #1580 Gives warning when explicit proxy configured in transparent mode... | Ujjwal Verma | 2017-02-09 | 2 | -4/+21 | |
* | | Merge pull request #2003 from Kriechi/coverage++ | Maximilian Hils | 2017-02-09 | 25 | -224/+295 | |
|\ \ | ||||||
| * | | improve coverage report | Thomas Kriechbaumer | 2017-02-09 | 1 | -6/+12 | |
| * | | minor changes | Thomas Kriechbaumer | 2017-02-09 | 4 | -3/+13 | |
| * | | eventsequence: coverage++ | Thomas Kriechbaumer | 2017-02-09 | 8 | -96/+72 | |
| * | | coverage whitelist -> blacklist | Thomas Kriechbaumer | 2017-02-09 | 2 | -24/+11 | |
| * | | stateobject: coverage++ | Thomas Kriechbaumer | 2017-02-09 | 1 | -0/+12 | |
| * | | websockets, tcp, version: coverage++ | Thomas Kriechbaumer | 2017-02-09 | 10 | -66/+171 | |
| * | | remove FIXME | Thomas Kriechbaumer | 2017-02-09 | 1 | -4/+3 | |
| * | | remove verified remark | Thomas Kriechbaumer | 2017-02-09 | 1 | -1/+0 | |
| * | | remove deprecated flow_count function | Thomas Kriechbaumer | 2017-02-09 | 3 | -15/+11 | |
| * | | simplify state copy | Maximilian Hils | 2017-02-09 | 2 | -21/+2 | |
* | | | flow_count() -> len(flows) | Maximilian Hils | 2017-02-09 | 1 | -2/+2 | |
* | | | Merge pull request #1998 from mhils/fix-change-upstream | Maximilian Hils | 2017-02-09 | 2 | -2/+33 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix change_upstream_proxy_server | Maximilian Hils | 2017-02-09 | 2 | -2/+33 | |
* | | | improve stateobject tests | Maximilian Hils | 2017-02-09 | 1 | -1/+7 | |
* | | | Merge pull request #2001 from mitmproxy/issue#40_response_body_edit | Maximilian Hils | 2017-02-09 | 1 | -1/+0 | |
|\ \ \ | ||||||
| * | | | fix response body edit issue | cle1000 | 2017-02-08 | 1 | -1/+0 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1999 from Kriechi/coverage++ | Maximilian Hils | 2017-02-09 | 22 | -106/+83 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | pytest.raises: shim new API | Thomas Kriechbaumer | 2017-02-08 | 22 | -106/+83 | |
|/ / | ||||||
* | | Merge pull request #1997 from s4chin/add-gif-parser | Maximilian Hils | 2017-02-08 | 13 | -7/+317 | |
|\ \ | ||||||
| * | | Fix gif parsing error on some gifs and add test | Sachin Kelkar | 2017-02-08 | 4 | -12/+25 | |
| * | | Add gif parser and tests | Sachin Kelkar | 2017-02-06 | 13 | -7/+304 | |
| |/ | ||||||
* | | Merge pull request #1984 from ujjwal96/har_dump-fix | Maximilian Hils | 2017-02-08 | 3 | -22/+55 | |
|\ \ | |/ |/| | ||||||
| * | Encoding fixes and tests | Ujjwal Verma | 2017-02-05 | 3 | -22/+55 | |
|/ | ||||||
* | Merge pull request #1993 from Kriechi/coverage++ | Thomas Kriechbaumer | 2017-02-05 | 1 | -7/+0 | |
|\ | ||||||
| * | fix flaky test | Thomas Kriechbaumer | 2017-02-05 | 1 | -7/+0 | |
|/ | ||||||
* | Merge pull request #1989 from Kriechi/coverage++ | Maximilian Hils | 2017-02-04 | 11 | -20/+30 | |
|\ | ||||||
| * | coverage++ | Thomas Kriechbaumer | 2017-02-04 | 11 | -20/+30 | |
* | | Merge pull request #1988 from krsoninikhil/ordereddict | Maximilian Hils | 2017-02-04 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | Changes view._store from dict to OrderedDict | Nikhil Soni | 2017-02-04 | 1 | -1/+1 | |
* | | Merge pull request #1967 from s4chin/remove-pillow | Maximilian Hils | 2017-02-03 | 12 | -1/+406 | |
|\ \ | ||||||
| * | | Feedback | Sachin Kelkar | 2017-02-03 | 5 | -12/+28 | |
| * | | Fix and cleanup | Sachin Kelkar | 2017-02-03 | 3 | -93/+69 | |
| * | | Add iTXt and zTXt tests | Sachin Kelkar | 2017-02-03 | 4 | -19/+87 | |
| * | | Fix as per feedback and add more tests | Sachin Kelkar | 2017-02-03 | 12 | -43/+74 | |
| * | | Add png parser | Sachin Kelkar | 2017-02-03 | 7 | -6/+320 | |
* | | | Merge pull request #1983 from Kriechi/coverage++ | Maximilian Hils | 2017-02-03 | 3 | -2/+24 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | coverage++ | Thomas Kriechbaumer | 2017-02-03 | 3 | -2/+24 | |
| |/ | ||||||
* | | update installbuilder | Maximilian Hils | 2017-02-03 | 1 | -2/+2 | |
* | | Merge pull request #1982 from ujjwal96/preserve-marked-flows | Maximilian Hils | 2017-02-03 | 3 | -0/+21 | |
|\ \ | |/ |/| | ||||||
| * | Added test | Ujjwal Verma | 2017-02-03 | 1 | -0/+7 | |
| * | Closes #1960 'Z' removes unmarked flows | Ujjwal Verma | 2017-02-03 | 2 | -0/+14 | |
|/ | ||||||
* | fix merge | Thomas Kriechbaumer | 2017-02-02 | 3 | -10/+11 | |
* | Merge pull request #1979 from 0neblock/master | Maximilian Hils | 2017-02-02 | 1 | -1/+1 | |
|\ | ||||||
| * | Fixed following on flowlist | Aidan Cyr | 2017-02-02 | 1 | -1/+1 | |
* | | Merge pull request #1980 from Kriechi/improve-tests | Thomas Kriechbaumer | 2017-02-02 | 59 | -620/+533 | |
|\ \ | |/ |/| | ||||||
| * | adapt coverage checks | Thomas Kriechbaumer | 2017-02-02 | 2 | -8/+4 | |
| * | replace tutils.raises with pytest.raises + shim | Thomas Kriechbaumer | 2017-02-02 | 52 | -516/+465 | |
| * | cleanup test utils | Thomas Kriechbaumer | 2017-02-02 | 11 | -99/+67 | |
|/ |