aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
* | | | | | Merge pull request #3097 from cortesi/exampAldo Cortesi2018-05-052-4/+11
|\ \ \ \ \ \
| * | | | | | Revamp dup_and_replay exampleAldo Cortesi2018-05-052-4/+11
* | | | | | | Merge pull request #3091 from cortesi/dietickAldo Cortesi2018-05-038-48/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Remove the tick eventAldo Cortesi2018-05-028-48/+16
* | | | | | Merge pull request #3090 from cortesi/iflightAldo Cortesi2018-05-0216-62/+99
|\| | | | |
| * | | | | Catch some stray command.call invocationsAldo Cortesi2018-05-022-4/+4
| * | | | | taddons: remove has_eventAldo Cortesi2018-05-022-12/+0
| * | | | | Redesign keepservingAldo Cortesi2018-05-029-40/+78
| * | | | | console: use replay count commands in statusbarAldo Cortesi2018-05-022-4/+9
| * | | | | server replay: expose the replay.server.count commandAldo Cortesi2018-05-021-0/+1
| * | | | | client replay: replaying flows in-flight should be added to count()Aldo Cortesi2018-05-022-2/+7
* | | | | | Merge pull request #3089 from cortesi/creplayAldo Cortesi2018-05-0222-411/+386
|\| | | | |
| * | | | | commands: clarify command call interface, fix web app replayAldo Cortesi2018-05-028-35/+40
| * | | | | client replay: use count command for console statusbarAldo Cortesi2018-05-011-3/+4
| * | | | | client replay: expad and consolidate testsAldo Cortesi2018-05-014-97/+128
| * | | | | client replay: revert our changes if replay is abortedAldo Cortesi2018-04-301-0/+2
| * | | | | client replay: re-designAldo Cortesi2018-04-308-209/+154
| * | | | | client replay: move all client replay-related code into addonAldo Cortesi2018-04-279-269/+260
|/ / / / /
* | | | | Merge pull request #3082 from p1uymi/patch-2Aldo Cortesi2018-04-271-3/+3
|\ \ \ \ \
| * | | | | Changed syntax from v2 to v3p1uymi2018-04-261-3/+3
* | | | | | Merge pull request #3083 from mitmproxy/requires-io-masterAldo Cortesi2018-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [requires.io] dependency updaterequires.io2018-04-270-0/+0
| * | | | | [requires.io] dependency updaterequires.io2018-04-261-1/+1
|/ / / / /
* | | | | Merge pull request #3078 from kajojify/expanduserAldo Cortesi2018-04-264-5/+10
|\ \ \ \ \
| * | | | | Incompatible typesMiroslav2018-04-261-2/+2
| * | | | | LintMiroslav2018-04-261-1/+0
| * | | | | Fix #3002. Auto-expandingMiroslav2018-04-264-4/+10
* | | | | | Merge pull request #3076 from clyfish/keepaliveAldo Cortesi2018-04-261-0/+2
|\ \ \ \ \ \
| * | | | | | add SO_KEEPALIVECheng Liangyu2018-04-251-0/+2
* | | | | | | Merge pull request #3071 from cortesi/ticklessAldo Cortesi2018-04-2643-327/+348
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | test: shift test_data out of our public APIAldo Cortesi2018-04-2333-229/+216
| * | | | | | addons/script: improve relability of reload testAldo Cortesi2018-04-234-7/+13
| * | | | | | asyncio: shift script reloading out of the tick eventAldo Cortesi2018-04-2313-105/+133
| |/ / / / /
* | | | | | Merge pull request #3077 from mhils/pytest-fixMaximilian Hils2018-04-253-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix pytest invocation errorsMaximilian Hils2018-04-253-3/+3
|/ / / / /
* | | | | Merge pull request #3070 from CorTal/Fix#3066Thomas Kriechbaumer2018-04-181-1/+1
|\ \ \ \ \