| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | use flow.id to link websocket + handshake flows | Thomas Kriechbaumer | 2017-03-10 | 1 | -1/+2 | |
| | * | | | make websocket flows serializable | Thomas Kriechbaumer | 2017-03-09 | 7 | -31/+69 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #2128 from Kriechi/disable-more-h2c | Thomas Kriechbaumer | 2017-03-10 | 5 | -40/+82 | |
| |\ \ \ | ||||||
| | * | | | disable h2c prior knowledge connections | Thomas Kriechbaumer | 2017-03-10 | 5 | -40/+82 | |
| | |/ / | ||||||
| * | | | Merge pull request #2131 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-10 | 3 | -287/+0 | |
| |\ \ \ | |/ / |/| | | ||||||
| | * | | [web] remove the tests for abandoned files. | Matthew Shao | 2017-03-10 | 3 | -287/+0 | |
| |/ / | ||||||
| * | | Merge pull request #2100 from cortesi/options | Aldo Cortesi | 2017-03-09 | 52 | -1459/+1334 | |
| |\ \ | ||||||
| | * | | Send change event when options are reset | Aldo Cortesi | 2017-03-09 | 1 | -0/+1 | |
| | * | | Merge remote-tracking branch 'upstream/master' into options | Aldo Cortesi | 2017-03-09 | 4 | -3/+29 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | Merge pull request #2124 from mitmproxy/opensuse-docs | Maximilian Hils | 2017-03-08 | 1 | -0/+14 | |
| |\ \ \ | ||||||
| | * | | | add install docs for openSUSE | Maximilian Hils | 2017-03-08 | 1 | -0/+14 | |
| * | | | | Merge pull request #2121 from mitmproxy/address-leftovers | Maximilian Hils | 2017-03-08 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | fix tcp.Address leftovers | Maximilian Hils | 2017-03-08 | 1 | -1/+1 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge pull request #2090 from mitmproxy/fix-pathod-header-doc | Thomas Kriechbaumer | 2017-03-08 | 1 | -2/+2 | |
| |\ \ \ \ | |_|/ / |/| | | | ||||||
| | * | | | pathoc: fix documentation for headers | Maximilian Hils | 2017-03-02 | 1 | -2/+2 | |
| * | | | | Merge pull request #2117 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-08 | 1 | -0/+12 | |
| |\ \ \ \ | |_|/ / |/| | | | ||||||
| | * | | | Update .travis.yml | Matthew Shao | 2017-03-08 | 1 | -9/+6 | |
| | * | | | Add javascript tests to Travis CI. (#2093) | Matthew Shao | 2017-03-08 | 1 | -0/+15 | |
| |/ / / | ||||||
| | | * | typing.Type -> type | Maximilian Hils | 2017-03-08 | 1 | -2/+2 | |
| | | * | core -> core_option_validation | Maximilian Hils | 2017-03-08 | 3 | -7/+7 | |
| | | * | change add_option parameter order | Maximilian Hils | 2017-03-08 | 4 | -110/+111 | |
| | | * | unify server spec parsing | Maximilian Hils | 2017-03-08 | 7 | -54/+118 | |
| | | * | Merge remote-tracking branch 'upstream/master' into options | Aldo Cortesi | 2017-03-08 | 18 | -102/+142 | |
| | | |\ | |_|/ |/| | | ||||||
| * | | | Merge pull request #2108 from ayamamori/patch-1 | Maximilian Hils | 2017-03-07 | 9 | -11/+11 | |
| |\ \ \ | ||||||
| | * | | | fix other occurences of options shortcut | Maximilian Hils | 2017-03-07 | 8 | -10/+10 | |
| | * | | | Update tcpproxy.rst | Yamamori Akihiro | 2017-03-07 | 1 | -1/+1 | |
| * | | | | Revert "clearly indentify git-checkout as dev version" | Maximilian Hils | 2017-03-07 | 1 | -1/+1 | |
| * | | | | Merge pull request #2106 from davidpshaw/python_3_to_master | Maximilian Hils | 2017-03-07 | 3 | -4/+4 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | Updated for python 3 | David Shaw | 2017-03-06 | 3 | -4/+4 | |
| * | | | | Merge pull request #2101 from s4chin/add-websocket-filter-to-web | Maximilian Hils | 2017-03-06 | 2 | -84/+111 | |
| |\ \ \ \ | ||||||
| | * | | | | web: Add websocket filter | Sachin Kelkar | 2017-03-06 | 2 | -84/+111 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2104 from lymanZerga11/patch-2 | Maximilian Hils | 2017-03-06 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Update flowlist.py | lymanZerga11 | 2017-03-06 | 1 | -1/+1 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2105 from Kriechi/dev-version | Maximilian Hils | 2017-03-06 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | clearly indentify git-checkout as dev version | Thomas Kriechbaumer | 2017-03-06 | 1 | -1/+1 | |
| * | | | | Merge pull request #2085 from MatthewShao/dev | Maximilian Hils | 2017-03-05 | 3 | -2/+15 | |
| |\ \ \ \ | ||||||
| | * | | | | [web] Retain focus on input field after selecting. (#2085) | Matthew Shao | 2017-03-04 | 1 | -0/+1 | |
| | * | | | | [web] Simplify the code. (#2085) | Matthew Shao | 2017-03-03 | 1 | -6/+2 | |
| | * | | | | [web] Add mouse support for FilterInput popover. | Matthew Shao | 2017-03-02 | 3 | -3/+19 | |
| | |/ / / | ||||||
| | | | * | Carefully re-add a small number of short flags | Aldo Cortesi | 2017-03-07 | 6 | -39/+48 | |
| | | | * | Change the way proxy authetication is specified | Aldo Cortesi | 2017-03-07 | 5 | -58/+51 | |
| | | | * | Add type and choices to options dump commets. | Aldo Cortesi | 2017-03-07 | 2 | -21/+34 | |
| | | | * | Options tweaks | Aldo Cortesi | 2017-03-07 | 4 | -111/+131 | |
| | | | * | Remove less commonly used command-line options | Aldo Cortesi | 2017-03-07 | 3 | -74/+5 | |
| | | | * | Add the --set option to set options directly | Aldo Cortesi | 2017-03-07 | 4 | -6/+100 | |
| | | | * | Option spacing and coverage | Aldo Cortesi | 2017-03-07 | 3 | -15/+37 | |
| | | | * | Add --options that dumps annotated option defaults | Aldo Cortesi | 2017-03-07 | 4 | -5/+39 | |
| | | | * | Fix lint | Aldo Cortesi | 2017-03-07 | 1 | -1/+1 | |
| | | | * | Flatten commandline arg structure, extract common run func for tools | Aldo Cortesi | 2017-03-07 | 2 | -100/+51 | |
| | | | * | Cleanups and test coverage | Aldo Cortesi | 2017-03-07 | 10 | -26/+45 | |
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |