aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2008 from yjh0502/masterMaximilian Hils2017-02-115-1/+61
|\
| * Add transparent proxy support for OpenBSDJihyun Yu2017-02-115-1/+61
* | consolidate readme shieldsMaximilian Hils2017-02-111-4/+4
|/
* Merge pull request #2005 from ujjwal96/script-reloadMaximilian Hils2017-02-112-2/+12
|\
| * closes #1828 script reloads on py file changesUjjwal Verma2017-02-102-2/+12
* | Merge pull request #2007 from mitmproxy/update-dependenciesMaximilian Hils2017-02-111-1/+1
|\ \
| * | update mypyMaximilian Hils2017-02-111-1/+1
| |/
* | Merge pull request #2006 from Kriechi/coverage++Maximilian Hils2017-02-1110-75/+95
|\ \ | |/ |/|
| * coverage++Thomas Kriechbaumer2017-02-1010-75/+95
* | Update .travis.ymlThomas Kriechbaumer2017-02-101-3/+2
|/
* Merge pull request #2004 from mhils/update-dependenciesMaximilian Hils2017-02-101-3/+3
|\
| * update dependenciesMaximilian Hils2017-02-101-3/+3
* | fix flaky coverageMaximilian Hils2017-02-101-2/+2
|/
* Merge pull request #2002 from mitmproxy/content_views_editMaximilian Hils2017-02-093-15/+6
|\
| * remove contentview selector and view description if edit mode is oncle10002017-02-082-14/+5
| * fix show_lines button visible in edit mode if you change tabscle10002017-02-081-1/+1
* | Closes #1580 Gives warning when explicit proxy configured in transparent mode...Ujjwal Verma2017-02-092-4/+21
* | Merge pull request #2003 from Kriechi/coverage++Maximilian Hils2017-02-0925-224/+295
|\ \
| * | improve coverage reportThomas Kriechbaumer2017-02-091-6/+12
| * | minor changesThomas Kriechbaumer2017-02-094-3/+13
| * | eventsequence: coverage++Thomas Kriechbaumer2017-02-098-96/+72
| * | coverage whitelist -> blacklistThomas Kriechbaumer2017-02-092-24/+11
| * | stateobject: coverage++Thomas Kriechbaumer2017-02-091-0/+12
| * | websockets, tcp, version: coverage++Thomas Kriechbaumer2017-02-0910-66/+171
| * | remove FIXMEThomas Kriechbaumer2017-02-091-4/+3
| * | remove verified remarkThomas Kriechbaumer2017-02-091-1/+0
| * | remove deprecated flow_count functionThomas Kriechbaumer2017-02-093-15/+11
| * | simplify state copyMaximilian Hils2017-02-092-21/+2
* | | flow_count() -> len(flows)Maximilian Hils2017-02-091-2/+2
* | | Merge pull request #1998 from mhils/fix-change-upstreamMaximilian Hils2017-02-092-2/+33
|\ \ \ | |/ / |/| |
| * | fix change_upstream_proxy_serverMaximilian Hils2017-02-092-2/+33
* | | improve stateobject testsMaximilian Hils2017-02-091-1/+7
* | | Merge pull request #2001 from mitmproxy/issue#40_response_body_editMaximilian Hils2017-02-091-1/+0
|\ \ \
| * | | fix response body edit issuecle10002017-02-081-1/+0
| | |/ | |/|
* | | Merge pull request #1999 from Kriechi/coverage++Maximilian Hils2017-02-0922-106/+83
|\ \ \ | |/ / |/| |
| * | pytest.raises: shim new APIThomas Kriechbaumer2017-02-0822-106/+83
|/ /
* | Merge pull request #1997 from s4chin/add-gif-parserMaximilian Hils2017-02-0813-7/+317
|\ \
| * | Fix gif parsing error on some gifs and add testSachin Kelkar2017-02-084-12/+25
| * | Add gif parser and testsSachin Kelkar2017-02-0613-7/+304
| |/
* | Merge pull request #1984 from ujjwal96/har_dump-fixMaximilian Hils2017-02-083-22/+55
|\ \ | |/ |/|
| * Encoding fixes and testsUjjwal Verma2017-02-053-22/+55
|/
* Merge pull request #1993 from Kriechi/coverage++Thomas Kriechbaumer2017-02-051-7/+0
|\
| * fix flaky testThomas Kriechbaumer2017-02-051-7/+0
|/
* Merge pull request #1989 from Kriechi/coverage++Maximilian Hils2017-02-0411-20/+30
|\
| * coverage++Thomas Kriechbaumer2017-02-0411-20/+30
* | Merge pull request #1988 from krsoninikhil/ordereddictMaximilian Hils2017-02-041-1/+1
|\ \ | |/ |/|
| * Changes view._store from dict to OrderedDictNikhil Soni2017-02-041-1/+1
* | Merge pull request #1967 from s4chin/remove-pillowMaximilian Hils2017-02-0312-1/+406
|\ \
| * | FeedbackSachin Kelkar2017-02-035-12/+28
| * | Fix and cleanupSachin Kelkar2017-02-033-93/+69
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 15:52:08 +0000