aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * docs: installation, WSLAldo Cortesi2018-05-162-6/+14
|/
* Merge pull request #3121 from Kriechi/py37-devThomas Kriechbaumer2018-05-153-7/+13
|\ | | | | test on Python 3.7-dev
| * fix py36/37 escaping issuesThomas Kriechbaumer2018-05-141-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-devThomas Kriechbaumer2018-05-132-1/+3
| |
* | Merge pull request #3125 from cortesi/ndocsAldo Cortesi2018-05-157-52/+92
|\ \ | | | | | | docs: tweaks and document keys.yaml
| * | docs: clarify binary packaage admonitionAldo Cortesi2018-05-151-13/+12
| | |
| * | docs: console key binding docs and exampleAldo Cortesi2018-05-152-0/+29
| | |
| * | docs: split out tool documentationAldo Cortesi2018-05-155-39/+51
|/ /
* | Merge pull request #3124 from joaquingx/masterAldo Cortesi2018-05-143-3/+3
|\ \ | |/ |/| Fixing Typos
| * Fixing TyposJoaquin2018-05-133-3/+3
|/
* Merge pull request #3117 from cortesi/morefixesAldo Cortesi2018-05-124-10/+10
|\ | | | | More misc fixes
| * command: handle string without terminal escaped charAldo Cortesi2018-05-122-1/+6
| | | | | | | | Fixes #2810
| * controller: add mysteriously missing comment portionAldo Cortesi2018-05-121-2/+2
| | | | | | | | Thanks to @tran-tien-dat
| * clientreplay: don't restrict outbound replay address to listen hostAldo Cortesi2018-05-121-7/+2
| | | | | | | | Fixes #2647
* | Merge pull request #3116 from cortesi/fixesAldo Cortesi2018-05-125-15/+39
|\| | | | | Misc fixes
| * script: tweak explicit command invocationAldo Cortesi2018-05-122-8/+5
| |
| * tcp: handle EINVAL from closed connectionsAldo Cortesi2018-05-121-0/+8
| | | | | | | | Fixes #2771
| * script: revamp ephemeral script runningAldo Cortesi2018-05-122-13/+21
| | | | | | | | Fixes 2838
| * Commit taken messages on killAldo Cortesi2018-05-121-0/+2
| | | | | | | | Fixes 2879
| * script: invoke addons as script with exception handlerAldo Cortesi2018-05-121-1/+2
| | | | | | | | Fixes #2837
| * console: implement positions for flow list walkerAldo Cortesi2018-05-121-0/+8
| | | | | | | | | | | | This papers over an urwid bug until they fix it. fixes #2973
* | Merge pull request #3115 from cortesi/cmdsAldo Cortesi2018-05-123-8/+63
|\| | | | | commands fixes and improvements
| * commands: handle type errors on startupAldo Cortesi2018-05-122-6/+41
| | | | | | | | | | fixes #3088 fixes #2787
| * commands: if no explicit return type is specified, assume NoneAldo Cortesi2018-05-122-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 listAldo Cortesi2018-05-111-4/+8
| |
* | Merge pull request #3028 from madt1m/Fix#3011Aldo Cortesi2018-05-122-1/+2
|\ \ | | | | | | Fix buggy keybindings in Data Viewer overlays
| * | New context for dataviewer overlaysmadt1m2018-04-012-1/+2
| | |
* | | Merge pull request #3114 from Kriechi/fix-tcp-exampleAldo Cortesi2018-05-121-12/+11
|\ \ \ | | | | | | | | fix tcp example