aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Show how to upgrade pip.BSalita2016-06-221-1/+3
| | | Windows install failed due to out of date pip. Show how to upgrade to latest pip.
* Merge pull request #1286 from gzzhanghao/settingsMaximilian Hils2016-06-214-164/+158
|\ | | | | [web] Fix settings ducks
| * [web] updateSettings -> handleWsMsgJason2016-06-224-164/+158
|/
* Merge pull request #1283 from dufferzafar/tnetstring3Thomas Kriechbaumer2016-06-215-155/+273
|\ | | | | tnetstring3
| * py3++Shadab Zafar2016-06-211-1/+1
| |
| * mitmproxy.tnetstring -> mitmproxy.contrib.tnetstringShadab Zafar2016-06-214-3/+4
| |
| * Imported tests for tnetstringShadab Zafar2016-06-211-0/+141
| | | | | | | | | | | | | | Copied from https://github.com/carlopires/tnetstring3/blob/a808f6b5ba8b64919b6b6359fd6a80bbf59e4557/tests/test_format.py Then ran pep8 etc.
| * Py3: tnetstringShadab Zafar2016-06-211-152/+128
|/ | | | | | | | Copied the initial code from [tnetstring3](https://raw.githubusercontent.com/carlopires/tnetstring3/master/tnetstring/__init__.py) Then made some changes, like using the isdigit function, removing superfluous ord() etc. to make all our tests pass.
* Minor wording improvements for the READMEAldo Cortesi2016-06-211-3/+3
|
* Merge pull request #1274 from Kriechi/discourse-readmeAldo Cortesi2016-06-211-2/+15
|\ | | | | add Discourse to README
| * add Discourse to READMEThomas Kriechbaumer2016-06-211-2/+15
|/
* add better descriptionMaximilian Hils2016-06-202-7/+8
|
* added tests for uiClemens2016-06-204-6/+41
|
* Merge pull request #1276 from dufferzafar/console-patheditMaximilian Hils2016-06-202-0/+26
|\ | | | | mitmproxy.console tests - PathEdit
| * 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:10:14 +0000