Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket | Jason | 2016-06-18 | 12 | -227/+206 |
|\ | |||||
| * | Merge pull request #1270 from mitmproxy/settings | Maximilian Hils | 2016-06-17 | 12 | -193/+168 |
| |\ | |||||
| | * | add setInterceptPattern action creator | Maximilian Hils | 2016-06-17 | 2 | -3/+13 |
| | * | add fetchApi.put shortcut | Maximilian Hils | 2016-06-17 | 1 | -3/+15 |
| | * | simplify settings reducer | Maximilian Hils | 2016-06-17 | 5 | -59/+58 |
| | * | [web] simplify settings | Jason | 2016-06-17 | 2 | -38/+10 |
| | * | Merge branch 'master' into settings | Jason | 2016-06-17 | 63 | -2109/+2133 |
| | |\ | | |/ | |/| | |||||
| | * | [web] fix settings ducks | Jason | 2016-06-17 | 4 | -163/+185 |
| | * | [web] promot reduce | Jason | 2016-06-17 | 2 | -18/+21 |
| | * | [web] remove store | Jason | 2016-06-17 | 4 | -99/+8 |
| | * | [web] eliminate SettingsStore | Jason | 2016-06-17 | 1 | -5/+0 |
| | * | [web] settings store | Jason | 2016-06-17 | 9 | -61763/+626 |
* | | | [web] add app ducks | Jason | 2016-06-18 | 4 | -46/+81 |
* | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 63 | -2103/+2127 |
|\| | | |||||
| * | | Merge pull request #1269 from Kriechi/pathod-netlib-http2 | Thomas Kriechbaumer | 2016-06-17 | 19 | -519/+533 |
| |\ \ | |||||
| | * | | move custom HTTP/2 stack from netlib to pathod | Thomas Kriechbaumer | 2016-06-17 | 19 | -519/+533 |
| |/ / | |||||
| * | | Merge pull request #1267 from gzzhanghao/components | Maximilian Hils | 2016-06-17 | 40 | -63374/+2172 |
| |\ \ | |||||
| | * | | [web] clean up | Jason | 2016-06-17 | 3 | -11/+4 |
| | * | | [web] common | Jason | 2016-06-17 | 12 | -229/+249 |
| | * | | [web] editor config for line endings | Jason | 2016-06-17 | 3 | -224/+225 |
| | * | | [web] Editor & Prompt | Jason | 2016-06-17 | 10 | -391/+392 |
| | * | | [web] FlowView and ContentView | Jason | 2016-06-17 | 24 | -62851/+1634 |
| | |/ | |||||
| * | | pathoc: use idna encoding for hostnames | Maximilian Hils | 2016-06-16 | 1 | -1/+1 |
| * | | pathod tests: do not string_escape specs | Shadab Zafar | 2016-06-16 | 1 | -1/+1 |
| * | | Py3: Store certificate with a byte key | Shadab Zafar | 2016-06-16 | 1 | -1/+1 |
| * | | Py3: Use BytesIO in a pathoc test | Shadab Zafar | 2016-06-16 | 1 | -1/+1 |
| * | | Py3: Send bytes to get_cert | Shadab Zafar | 2016-06-16 | 1 | -1/+1 |
| * | | Py3: pathoc should send bytes over wire | Shadab Zafar | 2016-06-16 | 2 | -5/+5 |
| * | | Enable Travis for the entire pathod directory :) | Shadab Zafar | 2016-06-16 | 1 | -1/+1 |
| * | | Py3: Fix tests by using byte literals | Shadab Zafar | 2016-06-16 | 1 | -7/+7 |
| * | | Merge pull request #1263 from Kriechi/readme | Maximilian Hils | 2016-06-16 | 2 | -0/+22 |
| |\ \ | | |/ | |/| | |||||
| | * | hide codecov.yml | Thomas Kriechbaumer | 2016-06-16 | 2 | -0/+3 |
| | * | update README with tox and flake8 info | Thomas Kriechbaumer | 2016-06-16 | 1 | -0/+19 |
* | | | [web] websocket | Jason | 2016-06-17 | 7 | -61934/+775 |
|/ / | |||||
* / | web: fix tests | Maximilian Hils | 2016-06-16 | 2 | -12/+9 |
|/ | |||||
* | web: use implicit bindActionCreators | Maximilian Hils | 2016-06-15 | 5 | -15/+10 |
* | Merge branch 'add_flow_to_options' | Maximilian Hils | 2016-06-15 | 11 | -691/+61989 |
|\ | |||||
| * | minor fixes | Maximilian Hils | 2016-06-15 | 3 | -14/+19 |
| * | rename view -> ui, make code more readable | Clemens | 2016-06-15 | 4 | -76/+79 |
| * | add previous state to dispatch function | Clemens | 2016-06-15 | 5 | -41/+67 |
| * | code review | Clemens | 2016-06-14 | 4 | -84/+36 |
| * | added flowMenu | Clemens | 2016-06-14 | 9 | -684/+61996 |
* | | Enable Travis for test/pathod/test_pathoc | Shadab Zafar | 2016-06-15 | 1 | -1/+1 |
* | | Unexpected spaces around = | Shadab Zafar | 2016-06-15 | 2 | -2/+2 |
* | | Py3: Split on byte newlines in pathod.log | Shadab Zafar | 2016-06-15 | 1 | -1/+1 |
* | | Py3: Find Content-Length header by bytes | Shadab Zafar | 2016-06-15 | 1 | -1/+1 |
* | | Py3: pathoc | Shadab Zafar | 2016-06-15 | 3 | -26/+34 |
* | | Py3: pathod | Shadab Zafar | 2016-06-15 | 2 | -14/+10 |
* | | Py3: websockets | Shadab Zafar | 2016-06-15 | 3 | -5/+6 |
* | | Py3: fix http2 bytes issue | Shadab Zafar | 2016-06-15 | 2 | -3/+3 |