Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Improve test case | yonder | 2016-03-04 | 2 | -1/+5 | |
| | * | | | Add test for upstream-auth | yonder | 2016-03-02 | 4 | -3/+23 | |
| | * | | | Add upstream proxy authentication | yonder | 2016-03-01 | 4 | -1/+22 | |
* | | | | | add icon for binaries | Maximilian Hils | 2016-03-08 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #993 from gzzhanghao/tests | Maximilian Hils | 2016-03-02 | 2 | -1/+5 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | [web] Fix eslint warnings about tests | Jason | 2016-03-02 | 2 | -1/+5 | |
|/ / / | ||||||
* | | | Merge pull request #992 from gzzhanghao/gulp | Maximilian Hils | 2016-03-02 | 1 | -0/+4 | |
|\ \ \ | ||||||
| * | | | [web] gulp: log errors from buildScript/bundle | Jason | 2016-03-02 | 1 | -0/+4 | |
* | | | | Merge pull request #991 from gzzhanghao/flowtable | Maximilian Hils | 2016-03-02 | 4 | -2250/+2250 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | [web] StoreView.index -> indexOf | Jason | 2016-03-02 | 4 | -2250/+2250 | |
|/ / / | ||||||
* | | | Merge pull request #990 from gzzhanghao/index | Maximilian Hils | 2016-03-02 | 2 | -2/+2 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | [web] fix StoreView.index | Jason | 2016-03-02 | 2 | -2/+2 | |
|/ / | ||||||
* | | web: use es6 modules | Maximilian Hils | 2016-02-29 | 24 | -939/+1079 | |
* | | web: fix router | Maximilian Hils | 2016-02-29 | 11 | -215/+232 | |
* | | fix up web stuff | Maximilian Hils | 2016-02-28 | 27 | -18082/+22298 | |
|/ | ||||||
* | suppress pathoc test timeouts on windows | Maximilian Hils | 2016-02-27 | 1 | -0/+2 | |
* | fix snapshot upload | Maximilian Hils | 2016-02-27 | 2 | -22/+25 | |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-27 | 5 | -17/+19 | |
|\ | ||||||
| * | Merge pull request #978 from Kriechi/dev-ci | Maximilian Hils | 2016-02-26 | 3 | -5/+6 | |
| |\ | ||||||
| | * | use dev-scripts on CI | Thomas Kriechbaumer | 2016-02-25 | 3 | -5/+6 | |
| |/ | ||||||
| * | fix #977 | Thomas Kriechbaumer | 2016-02-24 | 1 | -1/+1 | |
| * | fix h2 imports | Thomas Kriechbaumer | 2016-02-23 | 1 | -12/+12 | |
| * | Merge branch 'ParthGanatra-pip-upgrade' | Thomas Kriechbaumer | 2016-02-23 | 1 | -0/+1 | |
| |\ | ||||||
| | * | Update dev.sh | Parth Ganatra | 2016-02-23 | 1 | -0/+1 | |
* | | | add simplified connection constructor | Maximilian Hils | 2016-02-27 | 1 | -2/+26 | |
* | | | fix #966 | Maximilian Hils | 2016-02-27 | 1 | -3/+2 | |
|/ / | ||||||
* / | fix coverage collection | Maximilian Hils | 2016-02-23 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #967 from dufferzafar/766 | Aldo Cortesi | 2016-02-22 | 1 | -3/+3 | |
|\ | ||||||
| * | har_extractor: Replace deprecated stuff with recommended ones | Shadab Zafar | 2016-02-20 | 1 | -3/+3 | |
| * | har_extractor: Use items() instead of iteritems() | Shadab Zafar | 2016-02-20 | 1 | -2/+2 | |
* | | Doc tweaks | Aldo Cortesi | 2016-02-21 | 5 | -6/+11 | |
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2016-02-21 | 2 | -2/+2 | |
|\ \ | ||||||
| * | | fix proxy reconnect | Maximilian Hils | 2016-02-20 | 1 | -1/+1 | |
| * | | fix tests | Thomas Kriechbaumer | 2016-02-20 | 1 | -1/+1 | |
| |/ | ||||||
* / | First-order conversion of rtool to flat directory structure | Aldo Cortesi | 2016-02-19 | 1 | -80/+59 | |
|/ | ||||||
* | fix #951 | Maximilian Hils | 2016-02-19 | 1 | -9/+15 | |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-19 | 4 | -17/+27 | |
|\ | ||||||
| * | console: slightly less hacky hack show http2 warning after first tick | Aldo Cortesi | 2016-02-19 | 1 | -7/+8 | |
| * | Merge pull request #960 from Kriechi/enable-h2 | Aldo Cortesi | 2016-02-19 | 4 | -17/+26 | |
| |\ | ||||||
| | * | enable HTTP/2 by default if available | Thomas Kriechbaumer | 2016-02-18 | 4 | -17/+26 | |
* | | | fix #956 | Maximilian Hils | 2016-02-19 | 2 | -11/+5 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'duffer/pretty-host' | Maximilian Hils | 2016-02-18 | 3 | -5/+39 | |
|\ \ | |/ |/| | ||||||
| * | Fixup more tests | Shadab Zafar | 2016-02-18 | 2 | -5/+8 | |
| * | Incorporate comments made during review | Shadab Zafar | 2016-02-18 | 1 | -5/+3 | |
| * | Use host header values only when the ports match | Shadab Zafar | 2016-02-18 | 2 | -3/+12 | |
| * | Handle port numbers in host header | Shadab Zafar | 2016-02-17 | 2 | -3/+27 | |
* | | Merge pull request #964 from mitmproxy/flat-structure | Maximilian Hils | 2016-02-18 | 291 | -392/+77 | |
|\ \ | ||||||
| * | | fix .landscape.yml | Maximilian Hils | 2016-02-18 | 1 | -2/+2 | |
| * | | fix test paths, move coverage config into setup.py | Maximilian Hils | 2016-02-18 | 4 | -14/+15 | |
| * | | combine projects | Maximilian Hils | 2016-02-18 | 219 | -375/+59 |