| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | 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 | |||||
| * | | | 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 | |||||
| | * | | | 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] Working on components | |||||
| | * | | | [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 | |
| | | | | | | | | | | | | | Had to debug this for hours! | |||||
| * | | | 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 | |
| |\ \ \ | |/ / |/| | | Update README with information about tox & flake8. | |||||
| | * | | 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] 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: fix tests | Maximilian Hils | 2016-06-16 | 2 | -12/+9 | |
| |/ | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |