aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #3136 from Mrigank11/patch-2Maximilian Hils2018-05-181-1/+2
|\ \ | |/ |/|
| * Update flowview.lessMrigank Krishan2018-05-171-1/+2
* | Merge pull request #3137 from cortesi/racesAldo Cortesi2018-05-181-0/+3
|\ \
| * | clientreplay: fix racy tests harderAldo Cortesi2018-05-181-0/+3
|/ /
* | Merge pull request #3131 from cortesi/postreleaseAldo Cortesi2018-05-186-381/+119
|\ \ | |/ |/|
| * Release cleanupsAldo Cortesi2018-05-184-577/+0
| * improve release workflowThomas Kriechbaumer2018-05-174-83/+401
| * Update README.mdThomas Kriechbaumer2018-05-171-8/+8
| * Post-release updatesAldo Cortesi2018-05-173-31/+28
|/
* Revert "Remove MANIFEST.in"Thomas Kriechbaumer2018-05-171-0/+3
* Merge pull request #3130 from cortesi/clAldo Cortesi2018-05-171-1/+5
|\
| * CHANGELOGAldo Cortesi2018-05-171-1/+5
* | Merge pull request #3119 from Kriechi/inject-websocket-messageAldo Cortesi2018-05-175-1/+122
|\ \
| * | websocket: inject messages via flowThomas Kriechbaumer2018-05-165-1/+122
| |/
* | Merge pull request #3128 from cortesi/pdocsAldo Cortesi2018-05-172-6/+11
|\ \ | |/ |/|
| * 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
|\
| * fix py36/37 escaping issuesThomas Kriechbaumer2018-05-141-6/+10
| * test on Python 3.7-devThomas Kriechbaumer2018-05-132-1/+3
* | Merge pull request #3125 from cortesi/ndocsAldo Cortesi2018-05-157-52/+92
|\ \
| * | 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 TyposJoaquin2018-05-133-3/+3
|/
* Merge pull request #3117 from cortesi/morefixesAldo Cortesi2018-05-124-10/+10
|\
| * command: handle string without terminal escaped charAldo Cortesi2018-05-122-1/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:49:47 +0000