aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1270 from mitmproxy/settingsMaximilian Hils2016-06-1712-193/+168
|\
| * add setInterceptPattern action creatorMaximilian Hils2016-06-172-3/+13
| * add fetchApi.put shortcutMaximilian Hils2016-06-171-3/+15
| * simplify settings reducerMaximilian Hils2016-06-175-59/+58
| * [web] simplify settingsJason2016-06-172-38/+10
| * Merge branch 'master' into settingsJason2016-06-1763-2109/+2133
| |\ | |/ |/|
* | Merge pull request #1269 from Kriechi/pathod-netlib-http2Thomas Kriechbaumer2016-06-1719-519/+533
|\ \
| * | move custom HTTP/2 stack from netlib to pathodThomas Kriechbaumer2016-06-1719-519/+533
|/ /
* | Merge pull request #1267 from gzzhanghao/componentsMaximilian Hils2016-06-1740-63374/+2172
|\ \
| * | [web] clean upJason2016-06-173-11/+4
| * | [web] commonJason2016-06-1712-229/+249
| * | [web] editor config for line endingsJason2016-06-173-224/+225
| * | [web] Editor & PromptJason2016-06-1710-391/+392
| * | [web] FlowView and ContentViewJason2016-06-1724-62851/+1634
* | | pathoc: use idna encoding for hostnamesMaximilian Hils2016-06-161-1/+1
* | | pathod tests: do not string_escape specsShadab Zafar2016-06-161-1/+1
* | | Py3: Store certificate with a byte keyShadab Zafar2016-06-161-1/+1
* | | Py3: Use BytesIO in a pathoc testShadab Zafar2016-06-161-1/+1
* | | Py3: Send bytes to get_certShadab Zafar2016-06-161-1/+1
* | | Py3: pathoc should send bytes over wireShadab Zafar2016-06-162-5/+5
* | | Enable Travis for the entire pathod directory :)Shadab Zafar2016-06-161-1/+1
* | | Py3: Fix tests by using byte literalsShadab Zafar2016-06-161-7/+7
* | | Merge pull request #1263 from Kriechi/readmeMaximilian Hils2016-06-162-0/+22
|\ \ \ | |/ / |/| |
| * | hide codecov.ymlThomas Kriechbaumer2016-06-162-0/+3
| * | update README with tox and flake8 infoThomas Kriechbaumer2016-06-161-0/+19
| | * [web] fix settings ducksJason2016-06-174-163/+185
| | * [web] promot reduceJason2016-06-172-18/+21
| | * [web] remove storeJason2016-06-174-99/+8
| | * [web] eliminate SettingsStoreJason2016-06-171-5/+0
| | * [web] settings storeJason2016-06-179-61763/+626
| |/ |/|
* | web: fix testsMaximilian Hils2016-06-162-12/+9
|/
* web: use implicit bindActionCreatorsMaximilian Hils2016-06-155-15/+10
* Merge branch 'add_flow_to_options'Maximilian Hils2016-06-1511-691/+61989
|\
| * minor fixesMaximilian Hils2016-06-153-14/+19
| * rename view -> ui, make code more readableClemens2016-06-154-76/+79
| * add previous state to dispatch functionClemens2016-06-155-41/+67
| * code reviewClemens2016-06-144-84/+36
| * added flowMenuClemens2016-06-149-684/+61996
* | Enable Travis for test/pathod/test_pathocShadab Zafar2016-06-151-1/+1
* | Unexpected spaces around =Shadab Zafar2016-06-152-2/+2
* | Py3: Split on byte newlines in pathod.logShadab Zafar2016-06-151-1/+1
* | Py3: Find Content-Length header by bytesShadab Zafar2016-06-151-1/+1
* | Py3: pathocShadab Zafar2016-06-153-26/+34
* | Py3: pathodShadab Zafar2016-06-152-14/+10
* | Py3: websocketsShadab Zafar2016-06-153-5/+6
* | Py3: fix http2 bytes issueShadab Zafar2016-06-152-3/+3
* | Merge pull request #1257 from tdickers/masterMaximilian Hils2016-06-142-4/+7
|\ \
| * | Make har_extractor.py output HAR 1.2 spec-compliantTai Dickerson2016-06-142-4/+7
|/ /
* | Merge pull request #1253 from mhils/fix-debugAldo Cortesi2016-06-142-3/+9
|\ \
| * | fix debug mode on WindowsMaximilian Hils2016-06-132-3/+9
| |/