aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3225 from amm0nite/patch-1Thomas Kriechbaumer2018-06-261-3/+3
|\ \ \ | |_|/ |/| | Update CLI usage instructions for dns_spoofing example
| * | 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 object
| * | Add typechecking of Any values for state objectAldo Cortesi2018-06-172-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | An ugly solution for an ugly little problem. This patch uses JSON's type checker to validate Any values in stateobject, in order to avoid a circular import. Fixes #3180
* | | Merge pull request #3202 from madt1m/view-cleanupAldo Cortesi2018-06-1711-122/+191
|\ \ \ | | | | | | | | View Cleanup - Initial steps
| * | | 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 updates
| * | | | CHANGELOG, release/README updatesAldo Cortesi2018-06-162-6/+7
| | | | | | | | | | | | | | | | | | | | We no longer care about annotated tags.
* | | | | 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 branches
| * | | | cibuild: permit non-dev versions on maintenance branchesAldo Cortesi2018-06-162-4/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | Cater for the corner case where commits are incorporated on a maintenance branch. We should be able to test these without adding a dev suffix to the tool versions.
* | | | Merge pull request #3204 from cortesi/nureleaseAldo Cortesi2018-06-164-31/+89
|\ \ \ \ | |_|/ / |/| | | cibuild: cater for tags with "v" prefix
| * | | Simpler addon clear mechanismAldo Cortesi2018-06-161-2/+3
| | | | | | | | | | | | | | | | This should improve test robustness
| * | | cibuild: Match Travis env variable behaviourAldo Cortesi2018-06-162-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever TRAVIS_TAG is non-empty, TRAVIS_BRANCH is over-ridden to match the TRAVIS_TAG value. Adjust our tests to reflect this, and add a sanity check that fails hard if this constraint is ever not met. See https://github.com/travis-ci/travis-ci/issues/4745
| * | | 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 interpreters
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Adding Docker build for Raspberry Pi 3 (ARMv7 Processor Family)
| * | | 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 api
| * | improve websocket frame masking apiThomas Kriechbaumer2018-06-113-8/+2
|/ /
* | Merge pull request #3189 from Kriechi/bump-hugoMaximilian Hils2018-06-061-1/+1
|\ \ | |/ |/| bump hugo
| * 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
|\ | | | | Add support for IPv6 transparent mode on Windows
| * 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
| | | | | | | | This fixes #3080.
* | fix appveyor link in READMEMaximilian Hils2018-05-291-1/+1
| |
* | Merge pull request #3172 from mhils/issue-3133Maximilian Hils2018-05-283-5/+19
|\ \ | | | | | | Fix shutdown on Windows
| * | add missing awaitMaximilian Hils2018-05-281-1/+1
| | |
| * | fix shutdown on WindowsMaximilian Hils2018-05-282-4/+18
| | | | | | | | | | | | This fixes #3133.
* | | Merge pull request #3170 from kajojify/typoThomas Kriechbaumer2018-05-281-1/+1
|\ \ \ | |/ / |/| | typo
| * | typoMiroslav2018-05-271-1/+1
|/ /
* | Merge pull request #3164 from cortesi/ip6scopeAldo Cortesi2018-05-272-7/+13
|\| | | | | addons/block: teach block about IPv6 scope suffixes
| * addons/block: teach block about IPv6 scope suffixesAldo Cortesi2018-05-272-7/+13
| | | | | | | | Fixes #3160
* | Merge pull request #3163 from cortesi/deferAldo Cortesi2018-05-273-28/+28
|\| | | | | Use deferral mechanism for cfg file options
| * optmanager: tweaks and cleanupsAldo Cortesi2018-05-272-15/+15
| |
| * Use deferral mechanism for cfg file optionsAldo Cortesi2018-05-273-17/+17
|/ | | | Fixes #3162
* Fix typo in parver version specAldo Cortesi2018-05-271-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 07:00:17 +0000