Commit Graph

7825 Commits

Author SHA1 Message Date
Anderson Mesquita
4fdc3d9e15 Rename scripting file
In order to add the more scripting examples, it makes sense to rename
this file and avoid confusion.
2018-06-08 08:04:53 +02:00
Maximilian Hils
9047c4f2a5
Merge pull request #3189 from Kriechi/bump-hugo
bump hugo
2018-06-06 16:33:36 +02:00
Thomas Kriechbaumer
054b3272fc bump hugo 2018-06-05 20:48:36 +02:00
Maximilian Hils
09ff5df2fb Such CI, Very Wow. (#3182) 2018-06-02 21:37:44 +02:00
Maximilian Hils
28bd1275b2
Merge pull request #3174 from mhils/windows-ipv6
Add support for IPv6 transparent mode on Windows
2018-05-30 20:35:46 +02:00
Maximilian Hils
54ee135f65
windows transparent mode: always recalculate checksum 2018-05-29 15:15:07 +02:00
Maximilian Hils
bbfa960023
fix appveyor link in README 2018-05-29 13:29:19 +02:00
Maximilian Hils
8ebcf8ec96 fix IPv6 addresses with scope 2018-05-29 13:25:38 +02:00
Maximilian Hils
7d3d4ca9ea
Merge pull request #3172 from mhils/issue-3133
Fix shutdown on Windows
2018-05-28 23:29:08 +02:00
Maximilian Hils
aa0cb2ba2f add missing await 2018-05-28 22:27:27 +02:00
Maximilian Hils
1f6635c1fc fix shutdown on Windows
This fixes #3133.
2018-05-28 22:27:14 +02:00
Maximilian Hils
f0482eec54 add support for IPv6 transparent mode on Windows
This fixes #3080.
2018-05-28 21:43:28 +02:00
Thomas Kriechbaumer
3ccc319a27
Merge pull request #3170 from kajojify/typo
typo
2018-05-28 16:31:12 +02:00
Miroslav
06e12f56e2 typo 2018-05-27 19:40:26 +03:00
Aldo Cortesi
69aa5a0d2f
Merge pull request #3164 from cortesi/ip6scope
addons/block: teach block about IPv6 scope suffixes
2018-05-27 11:47:25 +12:00
Aldo Cortesi
dbf01cd34d
Merge pull request #3163 from cortesi/defer
Use deferral mechanism for cfg file options
2018-05-27 10:55:15 +12:00
Aldo Cortesi
a38d2d7b0e addons/block: teach block about IPv6 scope suffixes
Fixes #3160
2018-05-27 10:48:23 +12:00
Aldo Cortesi
ec2ae19e22 optmanager: tweaks and cleanups 2018-05-27 10:43:14 +12:00
Aldo Cortesi
e59ba13417 Use deferral mechanism for cfg file options
Fixes #3162
2018-05-27 10:12:24 +12:00
Aldo Cortesi
d1e3968fa8 Fix typo in parver version spec 2018-05-27 09:41:30 +12:00
Aldo Cortesi
8a76970944
Merge pull request #3157 from gcmurphy/issue/3147
Adjust options when changed
2018-05-26 10:51:24 +12:00
Thomas Kriechbaumer
7991c9e9b4 release: update docker instructions 2018-05-25 23:54:42 +02:00
Maximilian Hils
0f981bff25 docs: fix minimum page height 2018-05-25 15:29:25 +02:00
Maximilian Hils
b6123eede6 minor changes to stay in sync with sans-io 2018-05-25 13:22:52 +02:00
Grant Murphy
bd7069a9e0 Adjust options when changed
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
2018-05-25 11:38:08 +10:00
Aldo Cortesi
76c056affd
Merge pull request #3156 from cortesi/cibuild2
More cibuild tweaks
2018-05-25 13:13:10 +12:00
Aldo Cortesi
b6e1c4bb9d cibuild: tweak docker tag, only upload prod builds to pypi 2018-05-25 12:46:56 +12:00
Aldo Cortesi
ff92962c51 cibuild: start building version awareness 2018-05-25 10:50:48 +12:00
Maximilian Hils
1da4358706 [requires.io] dependency update on master branch (#3154) 2018-05-24 23:48:45 +02:00
Aldo Cortesi
f55293611e cibuild: minor - organize env class to make things easier to find 2018-05-25 09:07:18 +12:00
Aldo Cortesi
66d612eeca
Merge pull request #3152 from mitmproxy/cibuild
Tame cibuild (somewhat)
2018-05-25 08:29:24 +12:00
Aldo Cortesi
fdf0d9974e cibuild: more accurate PR test, better dump output 2018-05-24 22:58:33 +12:00
Aldo Cortesi
e9b19dba8a cibuild: fix docker upload condition, expand tests 2018-05-24 22:32:31 +12:00
Aldo Cortesi
c91b511bc7 cibuild: extract upload conditions 2018-05-24 22:18:01 +12:00
Aldo Cortesi
0afff3a952 cibuild: add docker tag calculation to environ 2018-05-24 21:59:45 +12:00
Aldo Cortesi
bae4a3393f release: include release directory in coverage
With lots of exclusions for now
2018-05-24 19:03:15 +12:00
Aldo Cortesi
8fceaca6b8 cibuild: Consolidate build environment and add tests 2018-05-24 11:06:43 +12:00
Maximilian Hils
f910f361a0
update appveyor badge 2018-05-22 11:15:24 +02:00
Maximilian Hils
e683fb68c9
appveyor: remove slack webhook 2018-05-22 11:13:19 +02:00
Aldo Cortesi
7aaf4953b4
Merge pull request #3138 from Kriechi/docker
add docker to the main repository
2018-05-22 09:18:20 +12:00
Thomas Kriechbaumer
46960fa080 add docker to the main repository 2018-05-19 12:38:44 +02:00
Maximilian Hils
967b314cdc
Merge pull request #3136 from Mrigank11/patch-2
[WEB] Make "Edit Flow" button fixed
2018-05-18 18:00:20 +02:00
Aldo Cortesi
eaca8fdaf7
Merge pull request #3137 from cortesi/races
track down racy tests
2018-05-18 10:09:20 +12:00
Aldo Cortesi
064929b559 clientreplay: fix racy tests harder 2018-05-18 09:51:56 +12:00
Aldo Cortesi
aae06c96dd
Merge pull request #3131 from cortesi/postrelease
Post-release updates
2018-05-18 08:33:17 +12:00
Aldo Cortesi
e1de592e46 Release cleanups
- rtool suck back in, the bastard! Delete it.
- Ditch CONTRRIBUTORS, saving a step. I added this before Github had a contributors
page, which is good enough:
    https://github.com/mitmproxy/mitmproxy/graphs/contributors
- Remove some cruft from CI that we no longer use.
2018-05-18 08:09:42 +12:00
Mrigank Krishan
27449d9c8b
Update flowview.less 2018-05-17 23:04:21 +05:30
Thomas Kriechbaumer
2bbfcfae92 improve release workflow 2018-05-17 18:28:43 +02:00
Thomas Kriechbaumer
762aa287cc Update README.md 2018-05-17 18:28:43 +02:00
Aldo Cortesi
052b378ea6 Post-release updates
- Update release docs
- Bump version
2018-05-17 18:28:43 +02:00