aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * script: tweak explicit command invocationAldo Cortesi2018-05-122-8/+5
| * tcp: handle EINVAL from closed connectionsAldo Cortesi2018-05-121-0/+8
| * script: revamp ephemeral script runningAldo Cortesi2018-05-122-13/+21
| * Commit taken messages on killAldo Cortesi2018-05-121-0/+2
| * script: invoke addons as script with exception handlerAldo Cortesi2018-05-121-1/+2
| * console: implement positions for flow list walkerAldo Cortesi2018-05-121-0/+8
* | Merge pull request #3115 from cortesi/cmdsAldo Cortesi2018-05-123-8/+63
|\|
| * commands: handle type errors on startupAldo Cortesi2018-05-122-6/+41
| * commands: if no explicit return type is specified, assume NoneAldo Cortesi2018-05-122-1/+17
| * console: fix bug that caused addon commands not to appear in command listAldo Cortesi2018-05-111-4/+8
* | Merge pull request #3028 from madt1m/Fix#3011Aldo Cortesi2018-05-122-1/+2
|\ \
| * | New context for dataviewer overlaysmadt1m2018-04-012-1/+2
* | | Merge pull request #3114 from Kriechi/fix-tcp-exampleAldo Cortesi2018-05-121-12/+11
|\ \ \
| * | | fix tcp exampleThomas Kriechbaumer2018-05-111-12/+11
* | | | Merge pull request #3110 from cortesi/miscAldo Cortesi2018-05-124-11/+37
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Remove MANIFEST.inAldo Cortesi2018-05-101-3/+0
| * | cmdline: --conf -> --confdir, which specifies the config directory, not the y...Aldo Cortesi2018-05-103-8/+12
| * | Initial changelog for 4.0Aldo Cortesi2018-05-101-0/+25
* | | Merge pull request #3109 from cortesi/kmapAldo Cortesi2018-05-1019-35/+231
|\| |
| * | keymap: read keys from CONFDIR/keys.yaml by defaultAldo Cortesi2018-05-104-5/+16
| * | cadir -> confdirAldo Cortesi2018-05-1016-34/+34
| * | console keybindings: define YAML-based format for console key binding persist...Aldo Cortesi2018-05-102-0/+185
|/ /
* | Merge pull request #3106 from cortesi/noprintMaximilian Hils2018-05-089-45/+11
|\ \
| * | clientplayback: try to fix flaky replay testAldo Cortesi2018-05-081-0/+2
| * | Ditch the addon stdout wrapperAldo Cortesi2018-05-088-45/+9
* | | Merge pull request #3107 from 0xHJK/masterThomas Kriechbaumer2018-05-081-0/+6
|\ \ \
| * | | har_dump example cmdline invocation0xHJK2018-05-081-0/+6
|/ / /
* | | Merge pull request #3105 from cortesi/optsAldo Cortesi2018-05-088-28/+84
|\| |
| * | optmanager: refactor for coverage and clarityAldo Cortesi2018-05-082-10/+6
| * | events: document behaviour of done() more fullyAldo Cortesi2018-05-081-2/+6
| * | benchmarks: quick-run scripts for mitmproxy and mitmdumpAldo Cortesi2018-05-082-0/+4
| * | benchmark: keep track of requests/responses seen by proxyAldo Cortesi2018-05-081-0/+10
| * | options: add the concept of deferred settingsAldo Cortesi2018-05-084-18/+60
|/ /
* | Merge pull request #3104 from cortesi/cmdcallAldo Cortesi2018-05-072-6/+6
|\ \
| * | Zap some commands.call invocations that were missed in the renameAldo Cortesi2018-05-072-6/+6
|/ /
* | Merge pull request #3103 from mhils/fix-processingThomas Kriechbaumer2018-05-062-4/+1
|\ \
| * | remove leftover processing_completeMaximilian Hils2018-05-062-4/+1
|/ /
* | Merge pull request #2986 from miheerdew/patch-1Thomas Kriechbaumer2018-05-061-2/+36
|\ \
| * \ Merge masterMiheer Dewaskar2018-03-2440-213/+416
| |\ \
| * | | SpellingMiheer Dewaskar2018-03-111-2/+2
| * | | Extrac comment and typoMiheer Dewaskar2018-03-111-1/+2
| * | | Workaround for MacOS transparent proxyMiheer Dewaskar2018-03-111-2/+37
* | | | Merge pull request #3100 from cortesi/blockThomas Kriechbaumer2018-05-065-94/+102
|\ \ \ \
| * | | | Remove allowremote addon, add an improved take called blockAldo Cortesi2018-05-065-94/+102
|/ / / /
* | | | Merge pull request #3099 from Kriechi/fix-3024Aldo Cortesi2018-05-062-15/+39
|\ \ \ \
| * | | | fix #3024Thomas Kriechbaumer2018-05-052-15/+39
* | | | | Merge pull request #3098 from drzax/patch-1Thomas Kriechbaumer2018-05-051-1/+1
|\ \ \ \ \
| * | | | | Fix typo in addons-overview.mdSimon Elvery2018-05-051-1/+1
|/ / / / /
* | | | | Merge pull request #3093 from cortesi/diecustomAldo Cortesi2018-05-052-16/+21
|\ \ \ \ \
| * | | | | Remove custom eventsAldo Cortesi2018-05-032-16/+21