aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Add dummy directory to completionShadab Zafar2016-06-201-0/+2
| | | | |
| * | | | Add tests for PathEditShadab Zafar2016-06-201-0/+24
| | | | |
* | | | | Merge pull request #1273 from Kriechi/fix-default-argMaximilian Hils2016-06-201-1/+4
|\ \ \ \ \ | | | | | | | | | | | | fix default arg
| * | | | | fix default argThomas Kriechbaumer2016-06-191-1/+4
| | | | | |
* | | | | | Merge pull request #1278 from mitmproxy/add_accept_revert_buttons_to_menu_flowMaximilian Hils2016-06-202-6/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | added accept and revert to flowmenu
| * | | | | | added accept and revert to flowmenuClemens2016-06-202-6/+10
| | | | | | |
* | | | | | | py3++Shadab Zafar2016-06-203-13/+14
| | | | | | |
* | | | | | | py3++Shadab Zafar2016-06-204-36/+36
|/ / / / / /
* | | | | | Merge remote-tracking branch 'jason/settings'Maximilian Hils2016-06-198-89/+79
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [web] replace SetttingsActions.update with settings.updateSettingsJason2016-06-198-89/+79
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1275 from Kriechi/more-py3Thomas Kriechbaumer2016-06-195-17/+19
|\ \ \ \ \ | |_|/ / / |/| | | | py3++
| * | | | py3++Thomas Kriechbaumer2016-06-195-17/+19
|/ / / /
* | | | Merge pull request #1272 from dwfreed/patch-1Maximilian Hils2016-06-181-2/+2
|\ \ \ \ | |/ / / |/| | | mitmproxy/models: missed comma in __all__
| * | | mitmproxy/models: missed comma in __all__Doug Freed2016-06-181-2/+2
|/ / / | | | | | | | | | | | | Spotted by Landscape (thanks @Kriechi for pointing out the site). Add a comma to the last item too, to prevent this from happening in the future and reduce messing up blame later.
* | | Merge pull request #1270 from mitmproxy/settingsMaximilian Hils2016-06-1712-193/+168
|\ \ \ | |_|/ |/| | [web] Settings Ducks 2
| * | 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
| |\ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
* | | Merge pull request #1269 from Kriechi/pathod-netlib-http2Thomas Kriechbaumer2016-06-1719-519/+533
|\ \ \ | | | | | | | | move custom HTTP/2 stack from netlib to pathod
| * | | 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] Working on components
| * | | [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
| | | | | | | | | | | | Had to debug this for hours!
* | | 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
|\ \ \ | |/ / |/| | Update README with information about tox & flake8.
| * | 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
| |