Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | optmanager: tweaks and cleanups | Aldo Cortesi | 2018-05-27 | 2 | -15/+15 |
| | |||||
* | Use deferral mechanism for cfg file options | Aldo Cortesi | 2018-05-27 | 3 | -17/+17 |
| | | | | Fixes #3162 | ||||
* | Fix typo in parver version spec | Aldo Cortesi | 2018-05-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3157 from gcmurphy/issue/3147 | Aldo Cortesi | 2018-05-26 | 2 | -0/+3 |
|\ | | | | | Adjust options when changed | ||||
| * | Adjust options when changed | Grant Murphy | 2018-05-25 | 2 | -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 instructions | Thomas Kriechbaumer | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | docs: fix minimum page height | Maximilian Hils | 2018-05-25 | 1 | -0/+8 |
| | | |||||
* | | minor changes to stay in sync with sans-io | Maximilian Hils | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3156 from cortesi/cibuild2 | Aldo Cortesi | 2018-05-25 | 4 | -77/+90 |
|\ \ | | | | | | | More cibuild tweaks | ||||
| * | | cibuild: tweak docker tag, only upload prod builds to pypi | Aldo Cortesi | 2018-05-25 | 2 | -13/+15 |
| | | | |||||
| * | | cibuild: start building version awareness | Aldo Cortesi | 2018-05-25 | 4 | -2/+13 |
| | | | |||||
| * | | cibuild: minor - organize env class to make things easier to find | Aldo Cortesi | 2018-05-25 | 1 | -68/+68 |
| | | | |||||
* | | | [requires.io] dependency update on master branch (#3154) | Maximilian Hils | 2018-05-24 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #3152 from mitmproxy/cibuild | Aldo Cortesi | 2018-05-25 | 5 | -166/+440 |
|\ \ | |/ |/| | Tame cibuild (somewhat) | ||||
| * | cibuild: more accurate PR test, better dump output | Aldo Cortesi | 2018-05-24 | 2 | -12/+21 |
| | | |||||
| * | cibuild: fix docker upload condition, expand tests | Aldo Cortesi | 2018-05-24 | 2 | -7/+38 |
| | | |||||
| * | cibuild: extract upload conditions | Aldo Cortesi | 2018-05-24 | 2 | -22/+37 |
| | | |||||
| * | cibuild: add docker tag calculation to environ | Aldo Cortesi | 2018-05-24 | 2 | -4/+18 |
| | | |||||
| * | release: include release directory in coverage | Aldo Cortesi | 2018-05-24 | 4 | -38/+70 |
| | | | | | | | | With lots of exclusions for now | ||||
| * | cibuild: Consolidate build environment and add tests | Aldo Cortesi | 2018-05-24 | 3 | -151/+324 |
|/ | |||||
* | update appveyor badge | Maximilian Hils | 2018-05-22 | 1 | -1/+1 |
| | |||||
* | appveyor: remove slack webhook | Maximilian Hils | 2018-05-22 | 1 | -4/+0 |
| | |||||
* | Merge pull request #3138 from Kriechi/docker | Aldo Cortesi | 2018-05-22 | 8 | -84/+214 |
|\ | | | | | add docker to the main repository | ||||
| * | add docker to the main repository | Thomas Kriechbaumer | 2018-05-19 | 8 | -84/+214 |
| | | |||||
* | | Merge pull request #3136 from Mrigank11/patch-2 | Maximilian Hils | 2018-05-18 | 1 | -1/+2 |
|\ \ | |/ |/| | [WEB] Make "Edit Flow" button fixed | ||||
| * | Update flowview.less | Mrigank Krishan | 2018-05-17 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #3137 from cortesi/races | Aldo Cortesi | 2018-05-18 | 1 | -0/+3 |
|\ \ | | | | | | | track down racy tests | ||||
| * | | clientreplay: fix racy tests harder | Aldo Cortesi | 2018-05-18 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #3131 from cortesi/postrelease | Aldo Cortesi | 2018-05-18 | 6 | -381/+119 |
|\ \ | |/ |/| | Post-release updates | ||||
| * | Release cleanups | Aldo Cortesi | 2018-05-18 | 4 | -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 workflow | Thomas Kriechbaumer | 2018-05-17 | 4 | -83/+401 |
| | | |||||
| * | Update README.md | Thomas Kriechbaumer | 2018-05-17 | 1 | -8/+8 |
| | | |||||
| * | Post-release updates | Aldo Cortesi | 2018-05-17 | 3 | -31/+28 |
|/ | | | | | - Update release docs - Bump version | ||||
* | Revert "Remove MANIFEST.in" | Thomas Kriechbaumer | 2018-05-17 | 1 | -0/+3 |
| | | | | This reverts commit 9a53525b83d4250f430de8bd4b375c5695743c4c. | ||||
* | Merge pull request #3130 from cortesi/cl | Aldo Cortesi | 2018-05-17 | 1 | -1/+5 |
|\ | | | | | CHANGELOG | ||||
| * | CHANGELOG | Aldo Cortesi | 2018-05-17 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #3119 from Kriechi/inject-websocket-message | Aldo Cortesi | 2018-05-17 | 5 | -1/+122 |
|\ \ | | | | | | | websocket: inject messages via flow | ||||
| * | | websocket: inject messages via flow | Thomas Kriechbaumer | 2018-05-16 | 5 | -1/+122 |
| |/ | |||||
* | | Merge pull request #3128 from cortesi/pdocs | Aldo Cortesi | 2018-05-17 | 2 | -6/+11 |
|\ \ | |/ |/| | docs - installation and minor updates | ||||
| * | docs: minor improvements to Windows installation | Maximilian Hils | 2018-05-16 | 1 | -7/+6 |
| | | |||||
| * | docs: complete, informative documentation on our SOCKS5 mode | Aldo Cortesi | 2018-05-16 | 1 | -3/+1 |
| | | |||||
| * | docs: installation, WSL | Aldo Cortesi | 2018-05-16 | 2 | -6/+14 |
|/ | |||||
* | Merge pull request #3121 from Kriechi/py37-dev | Thomas Kriechbaumer | 2018-05-15 | 3 | -7/+13 |
|\ | | | | | test on Python 3.7-dev | ||||
| * | fix py36/37 escaping issues | Thomas Kriechbaumer | 2018-05-14 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | closes #3122 https://bugs.python.org/issue16285 https://bugs.python.org/issue12910 https://github.com/python/cpython/commit/21024f06622c4c55b666adb130797a4ee205d005 | ||||
| * | test on Python 3.7-dev | Thomas Kriechbaumer | 2018-05-13 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #3125 from cortesi/ndocs | Aldo Cortesi | 2018-05-15 | 7 | -52/+92 |
|\ \ | | | | | | | docs: tweaks and document keys.yaml | ||||
| * | | docs: clarify binary packaage admonition | Aldo Cortesi | 2018-05-15 | 1 | -13/+12 |
| | | | |||||
| * | | docs: console key binding docs and example | Aldo Cortesi | 2018-05-15 | 2 | -0/+29 |
| | | | |||||
| * | | docs: split out tool documentation | Aldo Cortesi | 2018-05-15 | 5 | -39/+51 |
|/ / | |||||
* | | Merge pull request #3124 from joaquingx/master | Aldo Cortesi | 2018-05-14 | 3 | -3/+3 |
|\ \ | |/ |/| | Fixing Typos |