Commit Graph

7845 Commits

Author SHA1 Message Date
Aldo Cortesi
9113dabb32
Merge pull request #3207 from cortesi/postrelease
CHANGELOG, release/README updates
2018-06-17 09:08:46 +12:00
Aldo Cortesi
58c93a233b CHANGELOG, release/README updates
We no longer care about annotated tags.
2018-06-16 23:36:39 +12:00
Thomas Kriechbaumer
62d0d3db63 update release information for Docker 2018-06-16 11:19:11 +02:00
Aldo Cortesi
ba7047a9a4
Merge pull request #3205 from cortesi/ccase
cibuild: permit non-dev versions on maintenance branches
2018-06-16 15:38:27 +12:00
Aldo Cortesi
9463fee764 cibuild: permit non-dev versions on maintenance branches
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.
2018-06-16 15:09:34 +12:00
Aldo Cortesi
94a22b8795
Merge pull request #3204 from cortesi/nurelease
cibuild: cater for tags with "v" prefix
2018-06-16 11:21:22 +12:00
Aldo Cortesi
f5a6499b15 Simpler addon clear mechanism
This should improve test robustness
2018-06-16 10:59:24 +12:00
Aldo Cortesi
85526e5370 cibuild: Match Travis env variable behaviour
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
2018-06-16 10:23:33 +12:00
Aldo Cortesi
bf791ba1d5 cibuild: refactor to handle v prefix for release tag names 2018-06-16 09:48:21 +12:00
Aldo Cortesi
ff8a9f5440 Sync CHANGELOG for v4.x 2018-06-16 09:07:37 +12:00
Maximilian Hils
3227f67d88 update compiled mitmweb assets 2018-06-15 17:15:15 +02:00
Aldo Cortesi
212afebeb0
Merge pull request #3188 from Kriechi/py36-check
fix syntax-error on older python interpreters
2018-06-14 17:53:29 +12:00
Aldo Cortesi
d36b5aaada
Merge pull request #3190 from realeyes-media/master
Adding Docker build for Raspberry Pi 3 (ARMv7 Processor Family)
2018-06-13 09:19:42 +12:00
Thomas Kriechbaumer
b6fd9b4484
Merge pull request #3200 from Kriechi/websocket-frame-masking-api
improve websocket frame masking api
2018-06-11 13:40:31 +02:00
Thomas Kriechbaumer
be26958ea8 improve websocket frame masking api 2018-06-11 13:28:28 +02:00
Thomas Kriechbaumer
1413958a67 fix syntax-error on older python interpreters 2018-06-08 08:31:48 +02:00
marcymarcy
e98100e461 Combining Docker push steps, clarifying tag name 2018-06-06 11:01:49 -06:00
marcymarcy
4a25efda82 Using subprocesses 2018-06-06 10:39:19 -06:00
marcymarcy
2af9d20312 Renaming function, formatting fix 2018-06-06 09:49:57 -06:00
Maximilian Hils
9047c4f2a5
Merge pull request #3189 from Kriechi/bump-hugo
bump hugo
2018-06-06 16:33:36 +02:00
marcymarcy
d80271c641 Adding ARMv7 into build 2018-06-05 14:12:32 -06:00
marcymarcy
aeb772e741 Dockerfile for Raspberry Pi 3 2018-06-05 14:12:11 -06: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