aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix appveyor link in READMEMaximilian Hils2018-05-291-1/+1
|
* Merge pull request #3172 from mhils/issue-3133Maximilian Hils2018-05-283-5/+19
|\ | | | | Fix shutdown on Windows
| * add missing awaitMaximilian Hils2018-05-281-1/+1
| |
| * fix shutdown on WindowsMaximilian Hils2018-05-282-4/+18
| | | | | | | | This fixes #3133.
* | Merge pull request #3170 from kajojify/typoThomas Kriechbaumer2018-05-281-1/+1
|\ \ | |/ |/| typo
| * typoMiroslav2018-05-271-1/+1
|/
* Merge pull request #3164 from cortesi/ip6scopeAldo Cortesi2018-05-272-7/+13
|\ | | | | addons/block: teach block about IPv6 scope suffixes
| * addons/block: teach block about IPv6 scope suffixesAldo Cortesi2018-05-272-7/+13
| | | | | | | | Fixes #3160
* | Merge pull request #3163 from cortesi/deferAldo Cortesi2018-05-273-28/+28
|\| | | | | Use deferral mechanism for cfg file options
| * optmanager: tweaks and cleanupsAldo Cortesi2018-05-272-15/+15
| |
| * Use deferral mechanism for cfg file optionsAldo Cortesi2018-05-273-17/+17
|/ | | | Fixes #3162
* 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 changed
| * Adjust options when changedGrant Murphy2018-05-252-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 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
|\ \ | | | | | | More cibuild tweaks
| * | 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
|\ \ | |/ |/| Tame cibuild (somewhat)
| * 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
| | | | | | | | With lots of exclusions for now
| * 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 repository
| * add docker to the main repositoryThomas Kriechbaumer2018-05-198-84/+214
| |
* | Merge pull request #3136 from Mrigank11/patch-2Maximilian Hils2018-05-181-1/+2
|\ \ | |/ |/| [WEB] Make "Edit Flow" button fixed
| * Update flowview.lessMrigank Krishan2018-05-171-1/+2
| |
* | Merge pull request #3137 from cortesi/racesAldo Cortesi2018-05-181-0/+3
|\ \ | | | | | | track down racy tests
| * | clientreplay: fix racy tests harderAldo Cortesi2018-05-181-0/+3
|/ /
* | Merge pull request #3131 from cortesi/postreleaseAldo Cortesi2018-05-186-381/+119
|\ \ | |/ |/| Post-release updates
| * Release cleanupsAldo Cortesi2018-05-184-577/+0
| | | | | | | | | | | | | | | | - 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.
| * improve release workflowThomas Kriechbaumer2018-05-174-83/+401
| |
| * Update README.mdThomas Kriechbaumer2018-05-171-8/+8
| |
| * Post-release updatesAldo Cortesi2018-05-173-31/+28
|/ | | | | - Update release docs - Bump version
* Revert "Remove MANIFEST.in"Thomas Kriechbaumer2018-05-171-0/+3
| | | | This reverts commit 9a53525b83d4250f430de8bd4b375c5695743c4c.
* Merge pull request #3130 from cortesi/clAldo Cortesi2018-05-171-1/+5
|\ | | | | CHANGELOG
| * CHANGELOGAldo Cortesi2018-05-171-1/+5
| |
* | Merge pull request #3119 from Kriechi/inject-websocket-messageAldo Cortesi2018-05-175-1/+122
|\ \ | | | | | | websocket: inject messages via flow
| * | websocket: inject messages via flowThomas Kriechbaumer2018-05-165-1/+122
| |/
* | Merge pull request #3128 from cortesi/pdocsAldo Cortesi2018-05-172-6/+11
|\ \ | |/ |/| docs - installation and minor updates
| * docs: minor improvements to Windows installationMaximilian Hils2018-05-161-7/+6
| |
| * docs: complete, informative documentation on our SOCKS5 modeAldo Cortesi2018-05-161-3/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 11:22:06 +0000