aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge masterMiheer Dewaskar2018-03-2440-213/+416
|\
| * Merge pull request #3010 from Kriechi/bump-tornadoThomas Kriechbaumer2018-03-242-1/+5
| |\ | | | | | | fix Tornado 5.0 event loop
| | * fix Tornado 5.0 event loopThomas Kriechbaumer2018-03-242-1/+5
| |/ | | | | | | https://github.com/tornadoweb/tornado/issues/2183#issuecomment-371001254
| * [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 #2969
| | * 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
| |\ | | | | | | Docs Improvements
| | * various docs improvementsMaximilian Hils2018-03-2115-96/+141
| | | | | | | | | | | | | | | | | | | | | - add clickable anchors for headers - add "outdated" warning for archived docs - add "edit on github" button - beautify template
| | * 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 helpers
| | * bench: Add some very simple manual benchmarking helpersAldo Cortesi2018-03-176-0/+93
| | | | | | | | | | | | | | | This includes a profiler addon that we might consider for promotion to a builtin down the track.
| * | Merge pull request #2999 from fenilgandhi/Fix-2953Maximilian Hils2018-03-181-3/+1
| |\ \ | | | | | | | | Remove Highlight from status bar
| | * | 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.py
| | * Update cut.pyjplochocki2018-03-181-1/+1
| |/ | | | | Line 132: cut.clip command always copy "utf-8" when single cut specified (ie :cut.clip @focus request.method gets "utf-8")
| * Merge pull request #2991 from fenilgandhi/Fix-2990Maximilian Hils2018-03-151-4/+2
| |\ | | | | | | Removing the erroneously highlighted keybinding
| | * 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
| |\ | | | | | | Test for #2850
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-for-2850 few fixes mock testing Typo error
* | | SpellingMiheer Dewaskar2018-03-111-2/+2
| | |
* | | Extrac comment and typoMiheer Dewaskar2018-03-111-1/+2
| | |
* | | Workaround for MacOS transparent proxyMiheer Dewaskar2018-03-111-2/+37
|/ / | | | | This workaround (adopted from #1261) allows MacOS users to redirect their machine's outgoing traffic to mitmproxy transparently.
* | fix docstringThomas Kriechbaumer2018-03-101-1/+1
| |
* | Merge pull request #2985 from hcbarry/masterThomas Kriechbaumer2018-03-101-4/+4
|\ \ | | | | | | events.py typo fix
| * | Typo fixBarry Lee2018-03-101-4/+4
|/ /
* | Merge pull request #2977 from mitmproxy/updocs2Aldo Cortesi2018-03-0811-429/+324
|\ \ | | | | | | Revamp CI generation of snapshots and documentation
| * | 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
| | | | | | | | | | | | | | | | | | This is a precautionary measure to prevent a clash in case we have a branch with the same name as a tag. Tags live in the top-level directory, because these are releases that users will most often access directly.
| * | 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
| | | | | | | | | | | | In the process also move to InstallBuilder 18.2
| * | release: satisfy lintAldo Cortesi2018-03-071-30/+1
| | |
| * | release: cleanup and re-enable all our Travis testsAldo Cortesi2018-03-072-36/+33
| | | | | | | | | | | | Wheels are yet to come.
| * | release: revamped release upload processAldo Cortesi2018-03-077-300/+280
| | |
| * | docs: enable upload to docs.mitmproxy.org/masterAldo Cortesi2018-03-073-33/+49
| | |