Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update compiled mitmweb assets | Maximilian Hils | 2018-06-15 | 5 | -207/+203 |
| | |||||
* | Merge pull request #3188 from Kriechi/py36-check | Aldo Cortesi | 2018-06-14 | 4 | -173/+200 |
|\ | | | | | fix syntax-error on older python interpreters | ||||
| * | fix syntax-error on older python interpreters | Thomas Kriechbaumer | 2018-06-08 | 4 | -173/+200 |
| | | |||||
* | | Merge pull request #3190 from realeyes-media/master | Aldo Cortesi | 2018-06-13 | 2 | -1/+56 |
|\ \ | | | | | | | Adding Docker build for Raspberry Pi 3 (ARMv7 Processor Family) | ||||
| * | | Combining Docker push steps, clarifying tag name | marcymarcy | 2018-06-06 | 1 | -11/+2 |
| | | | |||||
| * | | Using subprocesses | marcymarcy | 2018-06-06 | 1 | -5/+1 |
| | | | |||||
| * | | Renaming function, formatting fix | marcymarcy | 2018-06-06 | 1 | -1/+2 |
| | | | |||||
| * | | Adding ARMv7 into build | marcymarcy | 2018-06-05 | 1 | -0/+22 |
| | | | |||||
| * | | Dockerfile for Raspberry Pi 3 | marcymarcy | 2018-06-05 | 1 | -0/+45 |
| |/ | |||||
* | | Merge pull request #3200 from Kriechi/websocket-frame-masking-api | Thomas Kriechbaumer | 2018-06-11 | 3 | -8/+2 |
|\ \ | | | | | | | improve websocket frame masking api | ||||
| * | | improve websocket frame masking api | Thomas Kriechbaumer | 2018-06-11 | 3 | -8/+2 |
|/ / | |||||
* | | Merge pull request #3189 from Kriechi/bump-hugo | Maximilian Hils | 2018-06-06 | 1 | -1/+1 |
|\ \ | |/ |/| | bump hugo | ||||
| * | bump hugo | Thomas Kriechbaumer | 2018-06-05 | 1 | -1/+1 |
|/ | |||||
* | Such CI, Very Wow. (#3182) | Maximilian Hils | 2018-06-02 | 11 | -223/+258 |
| | |||||
* | Merge pull request #3174 from mhils/windows-ipv6 | Maximilian Hils | 2018-05-30 | 1 | -311/+465 |
|\ | | | | | Add support for IPv6 transparent mode on Windows | ||||
| * | windows transparent mode: always recalculate checksum | Maximilian Hils | 2018-05-29 | 1 | -1/+3 |
| | | |||||
| * | fix IPv6 addresses with scope | Maximilian Hils | 2018-05-29 | 1 | -0/+1 |
| | | |||||
| * | add support for IPv6 transparent mode on Windows | Maximilian Hils | 2018-05-28 | 1 | -311/+462 |
| | | | | | | | | This fixes #3080. | ||||
* | | fix appveyor link in README | Maximilian Hils | 2018-05-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3172 from mhils/issue-3133 | Maximilian Hils | 2018-05-28 | 3 | -5/+19 |
|\ \ | | | | | | | Fix shutdown on Windows | ||||
| * | | add missing await | Maximilian Hils | 2018-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | fix shutdown on Windows | Maximilian Hils | 2018-05-28 | 2 | -4/+18 |
| | | | | | | | | | | | | This fixes #3133. | ||||
* | | | Merge pull request #3170 from kajojify/typo | Thomas Kriechbaumer | 2018-05-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | typo | ||||
| * | | typo | Miroslav | 2018-05-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3164 from cortesi/ip6scope | Aldo Cortesi | 2018-05-27 | 2 | -7/+13 |
|\| | | | | | addons/block: teach block about IPv6 scope suffixes | ||||
| * | addons/block: teach block about IPv6 scope suffixes | Aldo Cortesi | 2018-05-27 | 2 | -7/+13 |
| | | | | | | | | Fixes #3160 | ||||
* | | Merge pull request #3163 from cortesi/defer | Aldo Cortesi | 2018-05-27 | 3 | -28/+28 |
|\| | | | | | Use deferral mechanism for cfg file options | ||||
| * | optmanager: tweaks and cleanups | Aldo Cortesi | 2018-05-27 | 2 | -15/+15 |
| | | |||||
| * | Use deferral mechanism for cfg file options | Aldo Cortesi | 2018-05-27 | 3 | -17/+17 |
|/ | | | | Fixes #3162 | ||||
* | Fix typo in parver version spec | Aldo Cortesi | 2018-05-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3157 from gcmurphy/issue/3147 | Aldo Cortesi | 2018-05-26 | 2 | -0/+3 |
|\ | | | | | Adjust options when changed | ||||
| * | Adjust options when changed | Grant Murphy | 2018-05-25 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | The existing options for the console were not being updated when a new addon was added. This triggers the changed blinker signal when an option is added, and also recreates self.opts when this signal is received. Fixes #3147 | ||||
* | | release: update docker instructions | Thomas Kriechbaumer | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | docs: fix minimum page height | Maximilian Hils | 2018-05-25 | 1 | -0/+8 |
| | | |||||
* | | minor changes to stay in sync with sans-io | Maximilian Hils | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3156 from cortesi/cibuild2 | Aldo Cortesi | 2018-05-25 | 4 | -77/+90 |
|\ \ | | | | | | | More cibuild tweaks | ||||
| * | | cibuild: tweak docker tag, only upload prod builds to pypi | Aldo Cortesi | 2018-05-25 | 2 | -13/+15 |
| | | | |||||
| * | | cibuild: start building version awareness | Aldo Cortesi | 2018-05-25 | 4 | -2/+13 |
| | | | |||||
| * | | cibuild: minor - organize env class to make things easier to find | Aldo Cortesi | 2018-05-25 | 1 | -68/+68 |
| | | | |||||
* | | | [requires.io] dependency update on master branch (#3154) | Maximilian Hils | 2018-05-24 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #3152 from mitmproxy/cibuild | Aldo Cortesi | 2018-05-25 | 5 | -166/+440 |
|\ \ | |/ |/| | Tame cibuild (somewhat) | ||||
| * | cibuild: more accurate PR test, better dump output | Aldo Cortesi | 2018-05-24 | 2 | -12/+21 |
| | | |||||
| * | cibuild: fix docker upload condition, expand tests | Aldo Cortesi | 2018-05-24 | 2 | -7/+38 |
| | | |||||
| * | cibuild: extract upload conditions | Aldo Cortesi | 2018-05-24 | 2 | -22/+37 |
| | | |||||
| * | cibuild: add docker tag calculation to environ | Aldo Cortesi | 2018-05-24 | 2 | -4/+18 |
| | | |||||
| * | release: include release directory in coverage | Aldo Cortesi | 2018-05-24 | 4 | -38/+70 |
| | | | | | | | | With lots of exclusions for now | ||||
| * | cibuild: Consolidate build environment and add tests | Aldo Cortesi | 2018-05-24 | 3 | -151/+324 |
|/ | |||||
* | update appveyor badge | Maximilian Hils | 2018-05-22 | 1 | -1/+1 |
| | |||||
* | appveyor: remove slack webhook | Maximilian Hils | 2018-05-22 | 1 | -4/+0 |
| | |||||
* | Merge pull request #3138 from Kriechi/docker | Aldo Cortesi | 2018-05-22 | 8 | -84/+214 |
|\ | | | | | add docker to the main repository |