Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Fixing Typos | Joaquin | 2018-05-13 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #3117 from cortesi/morefixes | Aldo Cortesi | 2018-05-12 | 4 | -10/+10 |
|\ | | | | | More misc fixes | ||||
| * | command: handle string without terminal escaped char | Aldo Cortesi | 2018-05-12 | 2 | -1/+6 |
| | | | | | | | | Fixes #2810 | ||||
| * | controller: add mysteriously missing comment portion | Aldo Cortesi | 2018-05-12 | 1 | -2/+2 |
| | | | | | | | | Thanks to @tran-tien-dat | ||||
| * | clientreplay: don't restrict outbound replay address to listen host | Aldo Cortesi | 2018-05-12 | 1 | -7/+2 |
| | | | | | | | | Fixes #2647 | ||||
* | | Merge pull request #3116 from cortesi/fixes | Aldo Cortesi | 2018-05-12 | 5 | -15/+39 |
|\| | | | | | Misc fixes | ||||
| * | script: tweak explicit command invocation | Aldo Cortesi | 2018-05-12 | 2 | -8/+5 |
| | | |||||
| * | tcp: handle EINVAL from closed connections | Aldo Cortesi | 2018-05-12 | 1 | -0/+8 |
| | | | | | | | | Fixes #2771 | ||||
| * | script: revamp ephemeral script running | Aldo Cortesi | 2018-05-12 | 2 | -13/+21 |
| | | | | | | | | Fixes 2838 | ||||
| * | Commit taken messages on kill | Aldo Cortesi | 2018-05-12 | 1 | -0/+2 |
| | | | | | | | | Fixes 2879 | ||||
| * | script: invoke addons as script with exception handler | Aldo Cortesi | 2018-05-12 | 1 | -1/+2 |
| | | | | | | | | Fixes #2837 | ||||
| * | console: implement positions for flow list walker | Aldo Cortesi | 2018-05-12 | 1 | -0/+8 |
| | | | | | | | | | | | | This papers over an urwid bug until they fix it. fixes #2973 | ||||
* | | Merge pull request #3115 from cortesi/cmds | Aldo Cortesi | 2018-05-12 | 3 | -8/+63 |
|\| | | | | | commands fixes and improvements | ||||
| * | commands: handle type errors on startup | Aldo Cortesi | 2018-05-12 | 2 | -6/+41 |
| | | | | | | | | | | fixes #3088 fixes #2787 | ||||
| * | commands: if no explicit return type is specified, assume None | Aldo Cortesi | 2018-05-12 | 2 | -1/+17 |
| | | | | | | | | | | This is going to be a super common error for addon authors, so we might as well handle it. | ||||
| * | console: fix bug that caused addon commands not to appear in command list | Aldo Cortesi | 2018-05-11 | 1 | -4/+8 |
| | | |||||
* | | Merge pull request #3028 from madt1m/Fix#3011 | Aldo Cortesi | 2018-05-12 | 2 | -1/+2 |
|\ \ | | | | | | | Fix buggy keybindings in Data Viewer overlays | ||||
| * | | New context for dataviewer overlays | madt1m | 2018-04-01 | 2 | -1/+2 |
| | | | |||||
* | | | Merge pull request #3114 from Kriechi/fix-tcp-example | Aldo Cortesi | 2018-05-12 | 1 | -12/+11 |
|\ \ \ | | | | | | | | | fix tcp example |