aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3186 from andersonvom/masterAldo Cortesi2018-07-112-1/+16
|\
| * Add example to intercept/change specific requestsAnderson Mesquita2018-06-161-0/+15
| * Rename scripting fileAnderson Mesquita2018-06-082-1/+1
* | Merge pull request #3235 from gcmurphy/issues/3230Aldo Cortesi2018-07-111-1/+1
|\ \
| * | Pass option, not option name to parse_setvalGrant Murphy2018-07-021-1/+1
* | | Merge pull request #3239 from bunnyhero/patch-1Thomas Kriechbaumer2018-07-081-3/+3
|\ \ \ | |/ / |/| |
| * | Update howto-transparent.mdbunnyhero2018-07-051-3/+3
|/ /
* | Merge pull request #3233 from kajojify/defaultkeySamoilenko Roman2018-06-301-1/+1
|\ \
| * | view.create to view.flows.create for defaultkeysMiroslav2018-06-301-1/+1
|/ /
* | Merge pull request #3225 from amm0nite/patch-1Thomas Kriechbaumer2018-06-261-3/+3
|\ \
| * | Update CLI usage instructionsPierre Cavan2018-06-261-3/+3
|/ /
* | Merge pull request #3211 from cortesi/tcheckThomas Kriechbaumer2018-06-172-3/+10
|\ \
| * | Add typechecking of Any values for state objectAldo Cortesi2018-06-172-3/+10
* | | Merge pull request #3202 from madt1m/view-cleanupAldo Cortesi2018-06-1711-122/+191
|\ \ \
| * | | fixed exception type; full coverage on viewmadt1m2018-06-132-1/+6
| * | | Added tests for new primitivesmadt1m2018-06-132-18/+29
| * | | fixed linting errorsmadt1m2018-06-131-1/+3
| * | | added return statements to commandsmadt1m2018-06-131-2/+2
| * | | View API slightly extended; codebase cleaned in some pointsmadt1m2018-06-1310-104/+155
* | | | Merge pull request #3207 from cortesi/postreleaseAldo Cortesi2018-06-172-6/+7
|\ \ \ \
| * | | | CHANGELOG, release/README updatesAldo Cortesi2018-06-162-6/+7
* | | | | update release information for DockerThomas Kriechbaumer2018-06-161-1/+1
* | | | | Merge pull request #3205 from cortesi/ccaseAldo Cortesi2018-06-162-4/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cibuild: permit non-dev versions on maintenance branchesAldo Cortesi2018-06-162-4/+44
|/ / / /
* | | | Merge pull request #3204 from cortesi/nureleaseAldo Cortesi2018-06-164-31/+89
|\ \ \ \ | |_|/ / |/| | |
| * | | Simpler addon clear mechanismAldo Cortesi2018-06-161-2/+3
| * | | cibuild: Match Travis env variable behaviourAldo Cortesi2018-06-162-9/+25
| * | | cibuild: refactor to handle v prefix for release tag namesAldo Cortesi2018-06-162-22/+47
| * | | Sync CHANGELOG for v4.xAldo Cortesi2018-06-161-0/+16
|/ / /
* | | update compiled mitmweb assetsMaximilian Hils2018-06-155-207/+203
* | | Merge pull request #3188 from Kriechi/py36-checkAldo Cortesi2018-06-144-173/+200
|\ \ \
| * | | fix syntax-error on older python interpretersThomas Kriechbaumer2018-06-084-173/+200
* | | | Merge pull request #3190 from realeyes-media/masterAldo Cortesi2018-06-132-1/+56
|\ \ \ \ | |_|/ / |/| | |
| * | | Combining Docker push steps, clarifying tag namemarcymarcy2018-06-061-11/+2
| * | | Using subprocessesmarcymarcy2018-06-061-5/+1
| * | | Renaming function, formatting fixmarcymarcy2018-06-061-1/+2
| * | | Adding ARMv7 into buildmarcymarcy2018-06-051-0/+22
| * | | Dockerfile for Raspberry Pi 3marcymarcy2018-06-051-0/+45
| |/ /
* | | Merge pull request #3200 from Kriechi/websocket-frame-masking-apiThomas Kriechbaumer2018-06-113-8/+2
|\ \ \ | |_|/ |/| |
| * | improve websocket frame masking apiThomas Kriechbaumer2018-06-113-8/+2
|/ /
* | Merge pull request #3189 from Kriechi/bump-hugoMaximilian Hils2018-06-061-1/+1
|\ \ | |/ |/|
| * bump hugoThomas Kriechbaumer2018-06-051-1/+1
|/
* Such CI, Very Wow. (#3182)Maximilian Hils2018-06-0211-223/+258
* Merge pull request #3174 from mhils/windows-ipv6Maximilian Hils2018-05-301-311/+465
|\
| * windows transparent mode: always recalculate checksumMaximilian Hils2018-05-291-1/+3
| * fix IPv6 addresses with scopeMaximilian Hils2018-05-291-0/+1
| * add support for IPv6 transparent mode on WindowsMaximilian Hils2018-05-281-311/+462
* | fix appveyor link in READMEMaximilian Hils2018-05-291-1/+1
* | Merge pull request #3172 from mhils/issue-3133Maximilian Hils2018-05-283-5/+19
|\ \
| * | add missing awaitMaximilian Hils2018-05-281-1/+1