| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Fix netlib.utils.is_valid_host | Aldo Cortesi | 2016-07-21 | 3 | -2/+18 | |
| | |/ | ||||||
| * | | web: fix ValueEditor, clean up code | Maximilian Hils | 2016-07-21 | 27 | -747/+657 | |
| * | | web: fix flow content update | Maximilian Hils | 2016-07-21 | 1 | -13/+6 | |
| * | | Merge remote-tracking branch 'origin/flow_editing' | Maximilian Hils | 2016-07-20 | 15 | -32/+241 | |
| |\ \ | |/ |/| | ||||||
| | * | added flow_content update | Clemens | 2016-07-19 | 4 | -50/+98 | |
| | * | Merge remote-tracking branch 'origin/master' into flow_editing | Clemens | 2016-07-19 | 197 | -4960/+5992 | |
| | |\ | ||||||
| | * | | moved flow editor state to redux | Clemens | 2016-07-19 | 9 | -58/+118 | |
| | * | | added new btn, changed to codemirror | Clemens | 2016-07-15 | 7 | -40/+51 | |
| | * | | change way to edit | Clemens | 2016-07-14 | 9 | -89/+130 | |
| | * | | chaged editor style | Clemens | 2016-07-13 | 1 | -2/+2 | |
| | * | | gzip issue | Clemens | 2016-07-13 | 1 | -0/+1 | |
| | * | | make file out ouf string to combine flow content updates via editor and fileu... | Clemens | 2016-07-13 | 2 | -4/+3 | |
| | * | | added code editor and file upload | Clemens | 2016-07-13 | 9 | -56/+115 | |
| | * | | modify flow content | Clemens | 2016-07-11 | 7 | -12/+61 | |
| * | | | minor fixes | Maximilian Hils | 2016-07-19 | 4 | -4/+5 | |
| * | | | Merge pull request #1383 from cortesi/options | Aldo Cortesi | 2016-07-20 | 21 | -287/+287 | |
| |\ \ \ | ||||||
| | * | | | mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> mitmproxy... | Aldo Cortesi | 2016-07-20 | 21 | -287/+287 | |
| |/ / / | ||||||
| * | | | Merge pull request #1382 from cortesi/cleanup | Aldo Cortesi | 2016-07-20 | 5 | -61/+72 | |
| |\ \ \ | |_|/ |/| | | ||||||
| | * | | Merge branch 'master' into cleanup | Aldo Cortesi | 2016-07-19 | 28 | -895/+800 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | web: fix flow selection | Maximilian Hils | 2016-07-19 | 2 | -2/+2 | |
| * | | | update web assets | Maximilian Hils | 2016-07-19 | 2 | -484/+472 | |
| * | | | simplify web ui ducks | Maximilian Hils | 2016-07-19 | 23 | -400/+316 | |
| * | | | fix web master options leftovers | Maximilian Hils | 2016-07-19 | 2 | -7/+8 | |
| * | | | update README about Python support | Thomas Kriechbaumer | 2016-07-19 | 1 | -3/+3 | |
| | * | | Test suite: get_proxy_config -> get_options | Aldo Cortesi | 2016-07-19 | 3 | -41/+57 | |
| | * | | Simplify common initilization in cmdline.py | Aldo Cortesi | 2016-07-19 | 2 | -20/+15 | |
| |/ / | ||||||
| * | | Merge pull request #1379 from cortesi/proxyconfig | Aldo Cortesi | 2016-07-19 | 26 | -534/+626 | |
| |\ \ | ||||||
| | * | | Remove proxy.config.process_proxy_options | Aldo Cortesi | 2016-07-19 | 3 | -7/+3 | |
| | * | | ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.master | Aldo Cortesi | 2016-07-19 | 4 | -59/+27 | |
| | * | | ProxyConf: auth_* into Options | Aldo Cortesi | 2016-07-19 | 7 | -61/+73 | |
| | * | | ProxyConfig: http2, rawtcp, no_upstream_cert -> Options | Aldo Cortesi | 2016-07-19 | 10 | -27/+23 | |
| | * | | ProxyConfig: ciphers_client and ciphers_server -> Options | Aldo Cortesi | 2016-07-19 | 4 | -22/+21 | |
| | * | | ProxyConfig: Refactor to move verification mode checks into configure | Aldo Cortesi | 2016-07-19 | 2 | -24/+33 | |
| | * | | ProxyConfig: tcp_hosts and ignore_hosts to Options | Aldo Cortesi | 2016-07-19 | 3 | -9/+14 | |
| | * | | Regularize naming of upstream_trusted_ca* options | Aldo Cortesi | 2016-07-19 | 4 | -13/+11 | |
| | * | | ProxyConfig: various SSL options to Options | Aldo Cortesi | 2016-07-19 | 6 | -28/+33 | |
| | * | | Fix ca directory creation | Aldo Cortesi | 2016-07-19 | 1 | -4/+4 | |
| | * | | config.parse_server_spec shouldn't pass byts to tcp.Address | Aldo Cortesi | 2016-07-19 | 3 | -7/+7 | |
| | * | | ProxyConfig: mode, upstream_server and upstream_auth to Options | Aldo Cortesi | 2016-07-19 | 15 | -139/+173 | |
| | * | | Handle command-line argument errors properly | Aldo Cortesi | 2016-07-19 | 2 | -29/+37 | |
| | * | | ProxyConfig: --body-size-limit to Options | Aldo Cortesi | 2016-07-19 | 7 | -23/+37 | |
| | * | | ProxyConfig: --cert to options | Aldo Cortesi | 2016-07-19 | 3 | -17/+30 | |
| | * | | Move clientcers & cadir to Options | Aldo Cortesi | 2016-07-19 | 5 | -25/+42 | |
| | * | | ProxyConfig: cadir to options | Aldo Cortesi | 2016-07-19 | 6 | -21/+19 | |
| | * | | ProxyConfig refactor | Aldo Cortesi | 2016-07-19 | 10 | -74/+82 | |
| | * | | Unify proxy config and options | Aldo Cortesi | 2016-07-19 | 6 | -88/+100 | |
| |/ / | ||||||
| * | | web: remove SELECT_RELATIVE | Maximilian Hils | 2016-07-18 | 3 | -23/+15 | |
| * | | Merge remote-tracking branch 'jason/ui' | Maximilian Hils | 2016-07-18 | 16 | -428/+568 | |
| |\ \ | ||||||
| | * | | [web] update build | Jason | 2016-07-08 | 2 | -315/+315 | |
| | * | | [web] add tests for main view and ui | Jason | 2016-07-08 | 3 | -39/+172 | |
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |