aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* debug.sysinfo: tests and coverageAldo Cortesi2016-06-112-6/+15
* Add a --sysinfo flag to all daemonsAldo Cortesi2016-06-113-8/+44
* Merge pull request #1238 from cortesi/toxfiddleAldo Cortesi2016-06-112-8/+20
|\
| * Merge branch 'master' into toxfiddleAldo Cortesi2016-06-1126-1036/+1103
| |\ | |/ |/|
* | Merge remote-tracking branch 'jason/master'Maximilian Hils2016-06-1026-1036/+1103
|\ \
| * | [web] update buildJason2016-06-093-61562/+493
| * | [web] header.js -> Header.jsJason2016-06-0914-988/+62122
| * | [web] eventlog.js -> EventLog.jsxJason2016-06-096-191/+182
| * | [web] footer.js -> Footer.jsxJason2016-06-093-41/+38
| * | [web] fix shortcut for header fieldsJason2016-06-093-2/+3
| * | [web] separate flowtable to multiple filesJason2016-06-0913-394/+407
| | * tox: Pull Py3 test list out into an environment variableAldo Cortesi2016-06-111-2/+4
| | * We're not using tox-travis any more - ditch it.Aldo Cortesi2016-06-101-1/+1
| | * Remove explicit versions in tox CI environmentsAldo Cortesi2016-06-101-2/+0
| | * Distinguish between CI and interactive versions of toxAldo Cortesi2016-06-102-7/+19
| |/ |/|
* | Fix a crash when pathoc connections failAldo Cortesi2016-06-102-66/+62
* | Merge remote-tracking branch 'upstream/master' into pathodlogAldo Cortesi2016-06-1011-61673/+1037
|\|
| * Merge pull request #1233 from gzzhanghao/masterMaximilian Hils2016-06-0910-61671/+1035
| |\
| | * [web] update buildJason2016-06-093-61343/+488
| | * [web] fix updateLocationJason2016-06-095-663/+853
| | * [web] rewrite ProxyApp and MainView with es6Jason2016-06-096-356/+385
| |/
| * fix default websocket stateMaximilian Hils2016-06-081-2/+2
| * Merge pull request #1232 from cortesi/odictAldo Cortesi2016-06-098-334/+26
| |\
* | | Remove timestamps from pathoc outputAldo Cortesi2016-06-104-17/+21
| |/ |/|
* | Remove odictAldo Cortesi2016-06-098-334/+26
|/
* Merge pull request #1220 from mitmproxy/add_sorting_with_reduxMaximilian Hils2016-06-087-816/+1097
|\
| * sorting add pr review changesClemens2016-06-085-29/+60
| * sorting done, ready to reviewClemens2016-06-072-7/+5
| * sorting done, ready to reviewClemens2016-06-074-72/+58
| * moved redux state injection closer to childClemens2016-06-073-16/+38
| * start with sort, continue tomorrowClemens2016-06-073-36/+14
| * moved sort state to redux, missing apply sortClemens2016-06-075-788/+1054
* | properly fail on test failuresThomas Kriechbaumer2016-06-081-1/+1
* | Merge pull request #1230 from redfast00/masterMaximilian Hils2016-06-081-2/+2
|\ \
| * | fix after cleanup of netlib.utils in mitmproxy.console.statusbarredfast002016-06-081-2/+2
* | | Merge pull request #1223 from dufferzafar/pathod-lang-http2Thomas Kriechbaumer2016-06-083-42/+42
|\ \ \ | |/ / |/| |
| * | Py3: encode() the spec before appending to pathShadab Zafar2016-06-081-1/+1
| * | Py3: Find content-length header by bytesShadab Zafar2016-06-081-1/+1
| * | Py3: Pass bytes to http Request and ResponseShadab Zafar2016-06-081-5/+5
| * | Enable Travis for test_language_http2Shadab Zafar2016-06-081-1/+1
| * | Py3: Fix test_language_http2 tests by using byte literalsShadab Zafar2016-06-081-23/+23
| * | Py3: Use global next() instead of iterator methodShadab Zafar2016-06-081-2/+2
| * | Py3: Use BytesIO instead of StringIOShadab Zafar2016-06-081-8/+8
| * | Py3: Properly encode() access to user_agentsShadab Zafar2016-06-081-1/+1
|/ /
* | Merge pull request #1228 from cortesi/controller2Aldo Cortesi2016-06-0812-135/+115
|\ \
| * | If a message has been acked, all other processors are skippedAldo Cortesi2016-06-083-22/+40
| * | Simplify script concurrency helpersAldo Cortesi2016-06-083-55/+19
| * | A new interface for replyAldo Cortesi2016-06-086-41/+29
| * | Add reply.ack and reply.killAldo Cortesi2016-06-084-27/+37
|/ /
* | Merge branch 'master' into beautiful-jsonAldo Cortesi2016-06-089-39/+70
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 18:32:01 +0000