| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix debug mode on Windows | Maximilian Hils | 2016-06-13 | 2 | -3/+9 |
| * | Merge pull request #1242 from Kriechi/fix-1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 |
| |\ | |||||
| | * | fix #1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 |
| |/ | |||||
| * | Merge pull request #1247 from cortesi/appveyor | Aldo Cortesi | 2016-06-12 | 3 | -43/+62 |
| |\ | |||||
| | * | Merge branch 'master' into appveyor | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #1246 from cortesi/version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 |
| |\ \ | |||||
| | * | | Fold mitmproxy.version and pathod.version into netlib.version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 |
| |/ / | |||||
| | * | Make the tcp connection closer cancellable | Aldo Cortesi | 2016-06-12 | 2 | -42/+55 |
| | * | Be stricter about handling connetcts in the pathoc test suite | Aldo Cortesi | 2016-06-12 | 1 | -1/+7 |
| |/ | |||||
| * | Merge pull request #1243 from cortesi/debug2 | Thomas Kriechbaumer | 2016-06-11 | 3 | -2/+26 |
| |\ | |||||
| | * | Satisfy lint | Aldo Cortesi | 2016-06-11 | 1 | -1/+5 |
| | * | debug: On SIGUSR2, we dump tracebacks for all threads to screen | Aldo Cortesi | 2016-06-11 | 3 | -2/+22 |
| |/ | |||||
| * | Merge pull request #1241 from cortesi/debug | Aldo Cortesi | 2016-06-11 | 13 | -46/+183 |
| |\ | |||||
| | * | Zap stray semicolon | Aldo Cortesi | 2016-06-11 | 1 | -1/+1 |
| | * | debug: num_fds is posix-only | Aldo Cortesi | 2016-06-11 | 1 | -1/+2 |
| | * | debug: add OpenSSL | Aldo Cortesi | 2016-06-11 | 1 | -0/+3 |
| | * | debug: verison -> version | Aldo Cortesi | 2016-06-11 | 1 | -1/+1 |
| | * | Improve debugging of thread and other leaks | Aldo Cortesi | 2016-06-11 | 12 | -50/+138 |
| | * | debug.sysinfo: tests and coverage | Aldo Cortesi | 2016-06-11 | 2 | -6/+15 |
| | * | Add a --sysinfo flag to all daemons | Aldo Cortesi | 2016-06-11 | 3 | -8/+44 |
| |/ | |||||
| * | Merge pull request #1238 from cortesi/toxfiddle | Aldo Cortesi | 2016-06-11 | 2 | -8/+20 |
| |\ | |||||
| | * | Merge branch 'master' into toxfiddle | Aldo Cortesi | 2016-06-11 | 26 | -1036/+1103 |
| | |\ | |/ |/| | |||||
| * | | Merge remote-tracking branch 'jason/master' | Maximilian Hils | 2016-06-10 | 26 | -1036/+1103 |
| |\ \ | |||||
| | * | | [web] update build | Jason | 2016-06-09 | 3 | -61562/+493 |
| | * | | [web] header.js -> Header.js | Jason | 2016-06-09 | 14 | -988/+62122 |
| | * | | [web] eventlog.js -> EventLog.jsx | Jason | 2016-06-09 | 6 | -191/+182 |
| | * | | [web] footer.js -> Footer.jsx | Jason | 2016-06-09 | 3 | -41/+38 |
| | * | | [web] fix shortcut for header fields | Jason | 2016-06-09 | 3 | -2/+3 |
| | * | | [web] separate flowtable to multiple files | Jason | 2016-06-09 | 13 | -394/+407 |
| | | * | tox: Pull Py3 test list out into an environment variable | Aldo Cortesi | 2016-06-11 | 1 | -2/+4 |
| | | * | We're not using tox-travis any more - ditch it. | Aldo Cortesi | 2016-06-10 | 1 | -1/+1 |
| | | * | Remove explicit versions in tox CI environments | Aldo Cortesi | 2016-06-10 | 1 | -2/+0 |
| | | * | Distinguish between CI and interactive versions of tox | Aldo Cortesi | 2016-06-10 | 2 | -7/+19 |
| | |/ |/| | |||||
| * | | Fix a crash when pathoc connections fail | Aldo Cortesi | 2016-06-10 | 2 | -66/+62 |
| * | | Merge remote-tracking branch 'upstream/master' into pathodlog | Aldo Cortesi | 2016-06-10 | 11 | -61673/+1037 |
| |\| | |||||
| | * | Merge pull request #1233 from gzzhanghao/master | Maximilian Hils | 2016-06-09 | 10 | -61671/+1035 |
| | |\ | |||||
| | | * | [web] update build | Jason | 2016-06-09 | 3 | -61343/+488 |
| | | * | [web] fix updateLocation | Jason | 2016-06-09 | 5 | -663/+853 |
| | | * | [web] rewrite ProxyApp and MainView with es6 | Jason | 2016-06-09 | 6 | -356/+385 |
| | |/ | |||||
| | * | fix default websocket state | Maximilian Hils | 2016-06-08 | 1 | -2/+2 |
| | * | Merge pull request #1232 from cortesi/odict | Aldo Cortesi | 2016-06-09 | 8 | -334/+26 |
| | |\ | |||||
| * | | | Remove timestamps from pathoc output | Aldo Cortesi | 2016-06-10 | 4 | -17/+21 |
| | |/ |/| | |||||
| * | | Remove odict | Aldo Cortesi | 2016-06-09 | 8 | -334/+26 |
| |/ | |||||
| * | Merge pull request #1220 from mitmproxy/add_sorting_with_redux | Maximilian Hils | 2016-06-08 | 7 | -816/+1097 |
| |\ | |||||
| | * | sorting add pr review changes | Clemens | 2016-06-08 | 5 | -29/+60 |
| | * | sorting done, ready to review | Clemens | 2016-06-07 | 2 | -7/+5 |
| | * | sorting done, ready to review | Clemens | 2016-06-07 | 4 | -72/+58 |
| | * | moved redux state injection closer to child | Clemens | 2016-06-07 | 3 | -16/+38 |
| | * | start with sort, continue tomorrow | Clemens | 2016-06-07 | 3 | -36/+14 |
| | * | moved sort state to redux, missing apply sort | Clemens | 2016-06-07 | 5 | -788/+1054 |
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |