| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'jason/websocket' | Maximilian Hils | 2016-06-23 | 6 | -102/+184 |
| |\ | |||||
| | * | [web] set connected to false when DISCONNECTED | Jason | 2016-06-22 | 3 | -159/+153 |
| | | | |||||
| | * | [web] store ws object in symbol property | Jason | 2016-06-22 | 2 | -31/+10 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/master' into websocket | Jason | 2016-06-22 | 28 | -161/+260 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | * \ | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket | Jason | 2016-06-18 | 12 | -227/+206 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx web/src/js/connection.js | ||||
| | * | | | [web] add app ducks | Jason | 2016-06-18 | 4 | -46/+81 |
| | | | | | |||||
| | * | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 63 | -2103/+2127 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | * | | | | [web] websocket | Jason | 2016-06-17 | 7 | -61934/+775 |
| | | | | | | |||||
| * | | | | | Merge pull request #1285 from westurner/patch-1 | Maximilian Hils | 2016-06-23 | 1 | -2/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | DOC: install.rst: Installation on Fedora, Ubuntu | ||||
| | * | | | | | DOC: install.rst: Installation on Fedora, Ubuntu | Wes Turner | 2016-06-21 | 1 | -2/+18 |
| | | | | | | | |||||
| * | | | | | | http2: improve error handling in tests | Thomas Kriechbaumer | 2016-06-22 | 2 | -13/+31 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1291 from BSalita/master | Maximilian Hils | 2016-06-22 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Show how to upgrade pip. | ||||
| | * | | | | | | Show how to upgrade pip. | BSalita | 2016-06-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | Windows install failed due to out of date pip. Show how to upgrade to latest pip. | ||||
| * | | | | | | | Merge pull request #1282 from dufferzafar/py3 | Maximilian Hils | 2016-06-22 | 4 | -6/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Python 3 - mitmproxy.{protocol.http1, proxy, platform.pf} | ||||
| | * | | | | | | py3++: mitmproxy.platform.pf | Shadab Zafar | 2016-06-22 | 2 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | py3++: mitmproxy.protocol.http1 | Shadab Zafar | 2016-06-22 | 2 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | py3++: mitmproxy.proxy | Shadab Zafar | 2016-06-22 | 2 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1286 from gzzhanghao/settings | Maximilian Hils | 2016-06-21 | 4 | -164/+158 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | [web] Fix settings ducks | ||||
| | * | | | | | [web] updateSettings -> handleWsMsg | Jason | 2016-06-22 | 4 | -164/+158 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1283 from dufferzafar/tnetstring3 | Thomas Kriechbaumer | 2016-06-21 | 5 | -155/+273 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | tnetstring3 | ||||
| | * | | | | py3++ | Shadab Zafar | 2016-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | mitmproxy.tnetstring -> mitmproxy.contrib.tnetstring | Shadab Zafar | 2016-06-21 | 4 | -3/+4 |
| | | | | | | |||||
| | * | | | | Imported tests for tnetstring | Shadab Zafar | 2016-06-21 | 1 | -0/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from https://github.com/carlopires/tnetstring3/blob/a808f6b5ba8b64919b6b6359fd6a80bbf59e4557/tests/test_format.py Then ran pep8 etc. | ||||
| | * | | | | Py3: tnetstring | Shadab Zafar | 2016-06-21 | 1 | -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 README | Aldo Cortesi | 2016-06-21 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #1274 from Kriechi/discourse-readme | Aldo Cortesi | 2016-06-21 | 1 | -2/+15 |
| |\ \ \ \ | | | | | | | | | | | add Discourse to README | ||||
| | * | | | | add Discourse to README | Thomas Kriechbaumer | 2016-06-21 | 1 | -2/+15 |
| |/ / / / | |||||
| * | | | | add better description | Maximilian Hils | 2016-06-20 | 2 | -7/+8 |
| | | | | | |||||
| * | | | | added tests for ui | Clemens | 2016-06-20 | 4 | -6/+41 |
| | | | | | |||||
| * | | | | Merge pull request #1276 from dufferzafar/console-pathedit | Maximilian Hils | 2016-06-20 | 2 | -0/+26 |
| |\ \ \ \ | | | | | | | | | | | mitmproxy.console tests - PathEdit | ||||
| | * | | | | Add dummy directory to completion | Shadab Zafar | 2016-06-20 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Add tests for PathEdit | Shadab Zafar | 2016-06-20 | 1 | -0/+24 |
| | | | | | | |||||
| * | | | | | Merge pull request #1273 from Kriechi/fix-default-arg | Maximilian Hils | 2016-06-20 | 1 | -1/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix default arg | ||||
| | * | | | | | fix default arg | Thomas Kriechbaumer | 2016-06-19 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1278 from mitmproxy/add_accept_revert_buttons_to_menu_flow | Maximilian Hils | 2016-06-20 | 2 | -6/+10 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | added accept and revert to flowmenu | ||||
| | * | | | | | | added accept and revert to flowmenu | Clemens | 2016-06-20 | 2 | -6/+10 |
| | | | | | | | | |||||
| * | | | | | | | py3++ | Shadab Zafar | 2016-06-20 | 3 | -13/+14 |
| | | | | | | | | |||||
| * | | | | | | | py3++ | Shadab Zafar | 2016-06-20 | 4 | -36/+36 |
| |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'jason/settings' | Maximilian Hils | 2016-06-19 | 8 | -89/+79 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | [web] replace SetttingsActions.update with settings.updateSettings | Jason | 2016-06-19 | 8 | -89/+79 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #1275 from Kriechi/more-py3 | Thomas Kriechbaumer | 2016-06-19 | 5 | -17/+19 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | py3++ | ||||
| | * | | | | py3++ | Thomas Kriechbaumer | 2016-06-19 | 5 | -17/+19 |
| |/ / / / | |||||
| * | | | | Merge pull request #1272 from dwfreed/patch-1 | Maximilian Hils | 2016-06-18 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | mitmproxy/models: missed comma in __all__ | ||||
| | * | | | mitmproxy/models: missed comma in __all__ | Doug Freed | 2016-06-18 | 1 | -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/settings | Maximilian Hils | 2016-06-17 | 12 | -193/+168 |
| |\ \ \ | |_|/ |/| | | [web] Settings Ducks 2 | ||||
| | * | | 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 |
| | |\ \ | |/ / |/| | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |