| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Workaround for MacOS transparent proxy | Miheer Dewaskar | 2018-03-11 | 1 | -2/+37 | |
| * | | | | Merge pull request #3100 from cortesi/block | Thomas Kriechbaumer | 2018-05-06 | 5 | -94/+102 | |
| |\ \ \ \ | ||||||
| | * | | | | Remove allowremote addon, add an improved take called block | Aldo Cortesi | 2018-05-06 | 5 | -94/+102 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #3099 from Kriechi/fix-3024 | Aldo Cortesi | 2018-05-06 | 2 | -15/+39 | |
| |\ \ \ \ | ||||||
| | * | | | | fix #3024 | Thomas Kriechbaumer | 2018-05-05 | 2 | -15/+39 | |
| * | | | | | Merge pull request #3098 from drzax/patch-1 | Thomas Kriechbaumer | 2018-05-05 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix typo in addons-overview.md | Simon Elvery | 2018-05-05 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3093 from cortesi/diecustom | Aldo Cortesi | 2018-05-05 | 2 | -16/+21 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Remove custom events | Aldo Cortesi | 2018-05-03 | 2 | -16/+21 | |
| * | | | | | | Merge pull request #3097 from cortesi/examp | Aldo Cortesi | 2018-05-05 | 2 | -4/+11 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Revamp dup_and_replay example | Aldo Cortesi | 2018-05-05 | 2 | -4/+11 | |
| * | | | | | | | Merge pull request #3091 from cortesi/dietick | Aldo Cortesi | 2018-05-03 | 8 | -48/+16 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | ||||||
| | * | | | | | Remove the tick event | Aldo Cortesi | 2018-05-02 | 8 | -48/+16 | |
| * | | | | | | Merge pull request #3090 from cortesi/iflight | Aldo Cortesi | 2018-05-02 | 16 | -62/+99 | |
| |\| | | | | | ||||||
| | * | | | | | Catch some stray command.call invocations | Aldo Cortesi | 2018-05-02 | 2 | -4/+4 | |
| | * | | | | | taddons: remove has_event | Aldo Cortesi | 2018-05-02 | 2 | -12/+0 | |
| | * | | | | | Redesign keepserving | Aldo Cortesi | 2018-05-02 | 9 | -40/+78 | |
| | * | | | | | console: use replay count commands in statusbar | Aldo Cortesi | 2018-05-02 | 2 | -4/+9 | |
| | * | | | | | server replay: expose the replay.server.count command | Aldo Cortesi | 2018-05-02 | 1 | -0/+1 | |
| | * | | | | | client replay: replaying flows in-flight should be added to count() | Aldo Cortesi | 2018-05-02 | 2 | -2/+7 | |
| * | | | | | | Merge pull request #3089 from cortesi/creplay | Aldo Cortesi | 2018-05-02 | 22 | -411/+386 | |
| |\| | | | | | ||||||
| | * | | | | | commands: clarify command call interface, fix web app replay | Aldo Cortesi | 2018-05-02 | 8 | -35/+40 | |
| | * | | | | | client replay: use count command for console statusbar | Aldo Cortesi | 2018-05-01 | 1 | -3/+4 | |
| | * | | | | | client replay: expad and consolidate tests | Aldo Cortesi | 2018-05-01 | 4 | -97/+128 | |
| | * | | | | | client replay: revert our changes if replay is aborted | Aldo Cortesi | 2018-04-30 | 1 | -0/+2 | |
| | * | | | | | client replay: re-design | Aldo Cortesi | 2018-04-30 | 8 | -209/+154 | |
| | * | | | | | client replay: move all client replay-related code into addon | Aldo Cortesi | 2018-04-27 | 9 | -269/+260 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3082 from p1uymi/patch-2 | Aldo Cortesi | 2018-04-27 | 1 | -3/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Changed syntax from v2 to v3 | p1uymi | 2018-04-26 | 1 | -3/+3 | |
| * | | | | | | Merge pull request #3083 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| | * | | | | | [requires.io] dependency update | requires.io | 2018-04-27 | 0 | -0/+0 | |
| | * | | | | | [requires.io] dependency update | requires.io | 2018-04-26 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3078 from kajojify/expanduser | Aldo Cortesi | 2018-04-26 | 4 | -5/+10 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Incompatible types | Miroslav | 2018-04-26 | 1 | -2/+2 | |
| | * | | | | | Lint | Miroslav | 2018-04-26 | 1 | -1/+0 | |
| | * | | | | | Fix #3002. Auto-expanding | Miroslav | 2018-04-26 | 4 | -4/+10 | |
| * | | | | | | Merge pull request #3076 from clyfish/keepalive | Aldo Cortesi | 2018-04-26 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | add SO_KEEPALIVE | Cheng Liangyu | 2018-04-25 | 1 | -0/+2 | |
| * | | | | | | | Merge pull request #3071 from cortesi/tickless | Aldo Cortesi | 2018-04-26 | 43 | -327/+348 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| | * | | | | | | test: shift test_data out of our public API | Aldo Cortesi | 2018-04-23 | 33 | -229/+216 | |
| | * | | | | | | addons/script: improve relability of reload test | Aldo Cortesi | 2018-04-23 | 4 | -7/+13 | |
| | * | | | | | | asyncio: shift script reloading out of the tick event | Aldo Cortesi | 2018-04-23 | 13 | -105/+133 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #3077 from mhils/pytest-fix | Maximilian Hils | 2018-04-25 | 3 | -3/+3 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| | * | | | | | fix pytest invocation errors | Maximilian Hils | 2018-04-25 | 3 | -3/+3 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3070 from CorTal/Fix#3066 | Thomas Kriechbaumer | 2018-04-18 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | call_soon->ensure_future | CorTal | 2018-04-18 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #3069 from cortesi/mweb | Aldo Cortesi | 2018-04-18 | 3 | -29/+8 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | mitmweb: don't blort all over my config file | Aldo Cortesi | 2018-04-18 | 1 | -5/+5 | |
| | * | | | | | tcp: As of Python 3.5, EINTR is retried automatically by select | Aldo Cortesi | 2018-04-18 | 1 | -10/+1 | |
| | * | | | | | mitmweb: shift to use new run_loop wrapper on master | Aldo Cortesi | 2018-04-18 | 1 | -14/+2 | |
| |/ / / / / | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |