aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3188 from Kriechi/py36-checkAldo Cortesi2018-06-144-173/+200
|\
| * 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
|\ \
| * | 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 apiThomas Kriechbaumer2018-06-113-8/+2
|/ /
* | Merge pull request #3189 from Kriechi/bump-hugoMaximilian Hils2018-06-061-1/+1
|\ \ | |/ |/|
| * 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
|\
| * 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
* | fix appveyor link in READMEMaximilian Hils2018-05-291-1/+1
* | Merge pull request #3172 from mhils/issue-3133Maximilian Hils2018-05-283-5/+19
|\ \
| * | add missing awaitMaximilian Hils2018-05-281-1/+1
| * | fix shutdown on WindowsMaximilian Hils2018-05-282-4/+18
* | | Merge pull request #3170 from kajojify/typoThomas Kriechbaumer2018-05-281-1/+1
|\ \ \ | |/ / |/| |
| * | typoMiroslav2018-05-271-1/+1
|/ /
* | Merge pull request #3164 from cortesi/ip6scopeAldo Cortesi2018-05-272-7/+13
|\|
| * addons/block: teach block about IPv6 scope suffixesAldo Cortesi2018-05-272-7/+13
* | Merge pull request #3163 from cortesi/deferAldo Cortesi2018-05-273-28/+28
|\|
| * optmanager: tweaks and cleanupsAldo Cortesi2018-05-272-15/+15
| * Use deferral mechanism for cfg file optionsAldo Cortesi2018-05-273-17/+17
|/
* Fix typo in parver version specAldo Cortesi2018-05-271-1/+1
* Merge pull request #3157 from gcmurphy/issue/3147Aldo Cortesi2018-05-262-0/+3
|\
| * Adjust options when changedGrant Murphy2018-05-252-0/+3
* | release: update docker instructionsThomas Kriechbaumer2018-05-251-1/+1
* | docs: fix minimum page heightMaximilian Hils2018-05-251-0/+8
* | minor changes to stay in sync with sans-ioMaximilian Hils2018-05-251-1/+1
* | Merge pull request #3156 from cortesi/cibuild2Aldo Cortesi2018-05-254-77/+90
|\ \
| * | cibuild: tweak docker tag, only upload prod builds to pypiAldo Cortesi2018-05-252-13/+15
| * | cibuild: start building version awarenessAldo Cortesi2018-05-254-2/+13
| * | cibuild: minor - organize env class to make things easier to findAldo Cortesi2018-05-251-68/+68
* | | [requires.io] dependency update on master branch (#3154)Maximilian Hils2018-05-241-2/+2
|/ /
* | Merge pull request #3152 from mitmproxy/cibuildAldo Cortesi2018-05-255-166/+440
|\ \ | |/ |/|
| * cibuild: more accurate PR test, better dump outputAldo Cortesi2018-05-242-12/+21
| * cibuild: fix docker upload condition, expand testsAldo Cortesi2018-05-242-7/+38
| * cibuild: extract upload conditionsAldo Cortesi2018-05-242-22/+37
| * cibuild: add docker tag calculation to environAldo Cortesi2018-05-242-4/+18
| * release: include release directory in coverageAldo Cortesi2018-05-244-38/+70
| * cibuild: Consolidate build environment and add testsAldo Cortesi2018-05-243-151/+324
|/
* update appveyor badgeMaximilian Hils2018-05-221-1/+1
* appveyor: remove slack webhookMaximilian Hils2018-05-221-4/+0
* Merge pull request #3138 from Kriechi/dockerAldo Cortesi2018-05-228-84/+214
|\
| * add docker to the main repositoryThomas Kriechbaumer2018-05-198-84/+214
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 18:45:11 +0000