Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix tcp example | Thomas Kriechbaumer | 2018-05-11 | 1 | -12/+11 |
* | Merge pull request #3109 from cortesi/kmap | Aldo Cortesi | 2018-05-10 | 19 | -35/+231 |
|\ | |||||
| * | keymap: read keys from CONFDIR/keys.yaml by default | Aldo Cortesi | 2018-05-10 | 4 | -5/+16 |
| * | cadir -> confdir | Aldo Cortesi | 2018-05-10 | 16 | -34/+34 |
| * | console keybindings: define YAML-based format for console key binding persist... | Aldo Cortesi | 2018-05-10 | 2 | -0/+185 |
|/ | |||||
* | Merge pull request #3106 from cortesi/noprint | Maximilian Hils | 2018-05-08 | 9 | -45/+11 |
|\ | |||||
| * | clientplayback: try to fix flaky replay test | Aldo Cortesi | 2018-05-08 | 1 | -0/+2 |
| * | Ditch the addon stdout wrapper | Aldo Cortesi | 2018-05-08 | 8 | -45/+9 |
* | | Merge pull request #3107 from 0xHJK/master | Thomas Kriechbaumer | 2018-05-08 | 1 | -0/+6 |
|\ \ | |||||
| * | | har_dump example cmdline invocation | 0xHJK | 2018-05-08 | 1 | -0/+6 |
|/ / | |||||
* | | Merge pull request #3105 from cortesi/opts | Aldo Cortesi | 2018-05-08 | 8 | -28/+84 |
|\| | |||||
| * | optmanager: refactor for coverage and clarity | Aldo Cortesi | 2018-05-08 | 2 | -10/+6 |
| * | events: document behaviour of done() more fully | Aldo Cortesi | 2018-05-08 | 1 | -2/+6 |
| * | benchmarks: quick-run scripts for mitmproxy and mitmdump | Aldo Cortesi | 2018-05-08 | 2 | -0/+4 |
| * | benchmark: keep track of requests/responses seen by proxy | Aldo Cortesi | 2018-05-08 | 1 | -0/+10 |
| * | options: add the concept of deferred settings | Aldo Cortesi | 2018-05-08 | 4 | -18/+60 |
|/ | |||||
* | Merge pull request #3104 from cortesi/cmdcall | Aldo Cortesi | 2018-05-07 | 2 | -6/+6 |
|\ | |||||
| * | Zap some commands.call invocations that were missed in the rename | Aldo Cortesi | 2018-05-07 | 2 | -6/+6 |
|/ | |||||
* | Merge pull request #3103 from mhils/fix-processing | Thomas Kriechbaumer | 2018-05-06 | 2 | -4/+1 |
|\ | |||||
| * | remove leftover processing_complete | Maximilian Hils | 2018-05-06 | 2 | -4/+1 |
|/ | |||||
* | Merge pull request #2986 from miheerdew/patch-1 | Thomas Kriechbaumer | 2018-05-06 | 1 | -2/+36 |
|\ | |||||
| * | Merge master | Miheer Dewaskar | 2018-03-24 | 40 | -213/+416 |
| |\ | |||||
| * | | Spelling | Miheer Dewaskar | 2018-03-11 | 1 | -2/+2 |
| * | | Extrac comment and typo | Miheer Dewaskar | 2018-03-11 | 1 | -1/+2 |
| * | | 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 |