aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3012 from Kriechi/docs-optionsAldo Cortesi2018-03-3013-65/+126
|\
| * docs: add auto-generated options referenceThomas Kriechbaumer2018-03-2513-68/+115
| * docs: add skeleton for options scriptMaximilian Hils2018-03-241-0/+14
* | simplify READMEMaximilian Hils2018-03-281-2/+1
* | fix badgesThomas Kriechbaumer2018-03-271-4/+9
* | fix docs-related URLsThomas Kriechbaumer2018-03-271-3/+3
* | Merge pull request #3014 from MikeShi42/patch-1Thomas Kriechbaumer2018-03-271-1/+1
|\ \
| * | Fixed Typo in Transparent Proxy Setup for MacMichael Shi2018-03-261-1/+1
|/ /
* | Merge pull request #3010 from Kriechi/bump-tornadoThomas Kriechbaumer2018-03-242-1/+5
|\ \
| * | fix Tornado 5.0 event loopThomas Kriechbaumer2018-03-242-1/+5
|/ /
* | [requires.io] dependency update on master branch (#2992)Thomas Kriechbaumer2018-03-241-2/+2
* | Merge pull request #3008 from mhils/issue-2969Maximilian Hils2018-03-234-12/+18
|\ \ | |/ |/|
| * don't crash if server address is unknown, fix #2969Maximilian Hils2018-03-234-12/+18
|/
* fix cloudfront invalidation pathsMaximilian Hils2018-03-213-3/+3
* Merge pull request #3004 from mhils/docs-improvementsMaximilian Hils2018-03-2122-174/+250
|\
| * various docs improvementsMaximilian Hils2018-03-2115-96/+141
| * improve transparent mode docsMaximilian Hils2018-03-201-80/+75
| * minor docs fixesMaximilian Hils2018-03-203-36/+43
| * add google analyticsMaximilian Hils2018-03-202-0/+2
| * abort doc scripts on errorMaximilian Hils2018-03-205-1/+6
| * add README for docs installMaximilian Hils2018-03-201-0/+22
* | update mitmweb dev instructionsMaximilian Hils2018-03-202-6/+6
|/
* Merge pull request #2995 from cortesi/benchAldo Cortesi2018-03-196-0/+93
|\
| * bench: Add some very simple manual benchmarking helpersAldo Cortesi2018-03-176-0/+93
* | Merge pull request #2999 from fenilgandhi/Fix-2953Maximilian Hils2018-03-181-3/+1
|\ \
| * | minor improvementsMaximilian Hils2018-03-181-1/+1
| * | Remove Highlight from statusbarFenil Gandhi2018-03-191-3/+1
|/ /
* | Merge pull request #2997 from jplochocki/patch-1Maximilian Hils2018-03-181-1/+1
|\ \ | |/ |/|
| * Update cut.pyjplochocki2018-03-181-1/+1
|/
* Merge pull request #2991 from fenilgandhi/Fix-2990Maximilian Hils2018-03-151-4/+2
|\
| * Fixing the Fix for #2990Fenil Gandhi2018-03-151-0/+2
| * Removing the erroneously highlighted keybindingFenil Gandhi2018-03-151-4/+0
|/
* Merge pull request #2956 from kira0204/test-for-2850Maximilian Hils2018-03-152-3/+33
|\
| * adding commandkira02042018-03-121-3/+5
| * Testing using addonkira02042018-03-121-11/+17
| * fixing lintkira02042018-03-071-3/+3
| * using assertskira02042018-03-071-0/+3
| * wrong additionskira02042018-03-062-3/+22
* | fix docstringThomas Kriechbaumer2018-03-101-1/+1
* | Merge pull request #2985 from hcbarry/masterThomas Kriechbaumer2018-03-101-4/+4
|\ \
| * | Typo fixBarry Lee2018-03-101-4/+4
|/ /
* | Merge pull request #2977 from mitmproxy/updocs2Aldo Cortesi2018-03-0811-429/+324
|\ \
| * | release: fix PR detection for appveyorAldo Cortesi2018-03-081-1/+3
| * | release: put branches in /branches on the snapshots serverAldo Cortesi2018-03-081-1/+3
| * | release: build snapshots for all branches on the main repoAldo Cortesi2018-03-081-3/+2
| * | release: don't upload assets for PRs from the main repoAldo Cortesi2018-03-082-1/+16
| * | release: clean rtoolAldo Cortesi2018-03-071-79/+0
| * | docs: cloudfront invalidationAldo Cortesi2018-03-073-8/+8
| * | release: build wheelAldo Cortesi2018-03-073-15/+12
| * | release: shift appveyor to new processAldo Cortesi2018-03-074-52/+47