Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3235 from gcmurphy/issues/3230 | Aldo Cortesi | 2018-07-11 | 1 | -1/+1 |
|\ | |||||
| * | Pass option, not option name to parse_setval | Grant Murphy | 2018-07-02 | 1 | -1/+1 |
* | | Merge pull request #3239 from bunnyhero/patch-1 | Thomas Kriechbaumer | 2018-07-08 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Update howto-transparent.md | bunnyhero | 2018-07-05 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #3233 from kajojify/defaultkey | Samoilenko Roman | 2018-06-30 | 1 | -1/+1 |
|\ | |||||
| * | view.create to view.flows.create for defaultkeys | Miroslav | 2018-06-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3225 from amm0nite/patch-1 | Thomas Kriechbaumer | 2018-06-26 | 1 | -3/+3 |
|\ | |||||
| * | Update CLI usage instructions | Pierre Cavan | 2018-06-26 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #3211 from cortesi/tcheck | Thomas Kriechbaumer | 2018-06-17 | 2 | -3/+10 |
|\ | |||||
| * | Add typechecking of Any values for state object | Aldo Cortesi | 2018-06-17 | 2 | -3/+10 |
* | | Merge pull request #3202 from madt1m/view-cleanup | Aldo Cortesi | 2018-06-17 | 11 | -122/+191 |
|\ \ | |||||
| * | | fixed exception type; full coverage on view | madt1m | 2018-06-13 | 2 | -1/+6 |
| * | | Added tests for new primitives | madt1m | 2018-06-13 | 2 | -18/+29 |
| * | | fixed linting errors | madt1m | 2018-06-13 | 1 | -1/+3 |
| * | | added return statements to commands | madt1m | 2018-06-13 | 1 | -2/+2 |
| * | | View API slightly extended; codebase cleaned in some points | madt1m | 2018-06-13 | 10 | -104/+155 |
* | | | Merge pull request #3207 from cortesi/postrelease | Aldo Cortesi | 2018-06-17 | 2 | -6/+7 |
|\ \ \ | |||||
| * | | | CHANGELOG, release/README updates | Aldo Cortesi | 2018-06-16 | 2 | -6/+7 |
* | | | | update release information for Docker | Thomas Kriechbaumer | 2018-06-16 | 1 | -1/+1 |
* | | | | Merge pull request #3205 from cortesi/ccase | Aldo Cortesi | 2018-06-16 | 2 | -4/+44 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | cibuild: permit non-dev versions on maintenance branches | Aldo Cortesi | 2018-06-16 | 2 | -4/+44 |
|/ / / | |||||
* | | | Merge pull request #3204 from cortesi/nurelease | Aldo Cortesi | 2018-06-16 | 4 | -31/+89 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Simpler addon clear mechanism | Aldo Cortesi | 2018-06-16 | 1 | -2/+3 |
| * | | cibuild: Match Travis env variable behaviour | Aldo Cortesi | 2018-06-16 | 2 | -9/+25 |
| * | | cibuild: refactor to handle v prefix for release tag names | Aldo Cortesi | 2018-06-16 | 2 | -22/+47 |
| * | | Sync CHANGELOG for v4.x | Aldo Cortesi | 2018-06-16 | 1 | -0/+16 |
|/ / | |||||
* | | 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 | Thomas Kriechbaumer | 2018-06-08 | 4 | -173/+200 |
* | | | Merge pull request #3190 from realeyes-media/master | Aldo Cortesi | 2018-06-13 | 2 | -1/+56 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 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 | 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 | 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 |
|\ | |||||
| * | 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 |
* | | 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 |
|\ \ | |||||
| * | | add missing await | Maximilian Hils | 2018-05-28 | 1 | -1/+1 |
| * | | fix shutdown on Windows | Maximilian Hils | 2018-05-28 | 2 | -4/+18 |
* | | | Merge pull request #3170 from kajojify/typo | Thomas Kriechbaumer | 2018-05-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | typo | Miroslav | 2018-05-27 | 1 | -1/+1 |
|/ / |