Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master | Miheer Dewaskar | 2018-03-24 | 40 | -213/+416 |
|\ | |||||
| * | Merge pull request #3010 from Kriechi/bump-tornado | Thomas Kriechbaumer | 2018-03-24 | 2 | -1/+5 |
| |\ | |||||
| | * | fix Tornado 5.0 event loop | Thomas Kriechbaumer | 2018-03-24 | 2 | -1/+5 |
| |/ | |||||
| * | [requires.io] dependency update on master branch (#2992) | Thomas Kriechbaumer | 2018-03-24 | 1 | -2/+2 |
| * | Merge pull request #3008 from mhils/issue-2969 | Maximilian Hils | 2018-03-23 | 4 | -12/+18 |
| |\ | |||||
| | * | don't crash if server address is unknown, fix #2969 | Maximilian Hils | 2018-03-23 | 4 | -12/+18 |
| |/ | |||||
| * | fix cloudfront invalidation paths | Maximilian Hils | 2018-03-21 | 3 | -3/+3 |
| * | Merge pull request #3004 from mhils/docs-improvements | Maximilian Hils | 2018-03-21 | 22 | -174/+250 |
| |\ | |||||
| | * | various docs improvements | Maximilian Hils | 2018-03-21 | 15 | -96/+141 |
| | * | improve transparent mode docs | Maximilian Hils | 2018-03-20 | 1 | -80/+75 |
| | * | minor docs fixes | Maximilian Hils | 2018-03-20 | 3 | -36/+43 |
| | * | add google analytics | Maximilian Hils | 2018-03-20 | 2 | -0/+2 |
| | * | abort doc scripts on error | Maximilian Hils | 2018-03-20 | 5 | -1/+6 |
| | * | add README for docs install | Maximilian Hils | 2018-03-20 | 1 | -0/+22 |
| * | | update mitmweb dev instructions | Maximilian Hils | 2018-03-20 | 2 | -6/+6 |
| |/ | |||||
| * | Merge pull request #2995 from cortesi/bench | Aldo Cortesi | 2018-03-19 | 6 | -0/+93 |
| |\ | |||||
| | * | bench: Add some very simple manual benchmarking helpers | Aldo Cortesi | 2018-03-17 | 6 | -0/+93 |
| * | | Merge pull request #2999 from fenilgandhi/Fix-2953 | Maximilian Hils | 2018-03-18 | 1 | -3/+1 |
| |\ \ | |||||
| | * | | minor improvements | Maximilian Hils | 2018-03-18 | 1 | -1/+1 |
| | * | | Remove Highlight from statusbar | Fenil Gandhi | 2018-03-19 | 1 | -3/+1 |
| |/ / | |||||
| * | | Merge pull request #2997 from jplochocki/patch-1 | Maximilian Hils | 2018-03-18 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Update cut.py | jplochocki | 2018-03-18 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2991 from fenilgandhi/Fix-2990 | Maximilian Hils | 2018-03-15 | 1 | -4/+2 |
| |\ | |||||
| | * | Fixing the Fix for #2990 | Fenil Gandhi | 2018-03-15 | 1 | -0/+2 |
| | * | Removing the erroneously highlighted keybinding | Fenil Gandhi | 2018-03-15 | 1 | -4/+0 |
| |/ | |||||
| * | Merge pull request #2956 from kira0204/test-for-2850 | Maximilian Hils | 2018-03-15 | 2 | -3/+33 |
| |\ | |||||
| | * | adding command | kira0204 | 2018-03-12 | 1 | -3/+5 |
| | * | Testing using addon | kira0204 | 2018-03-12 | 1 | -11/+17 |
| | * | fixing lint | kira0204 | 2018-03-07 | 1 | -3/+3 |
| | * | using asserts | kira0204 | 2018-03-07 | 1 | -0/+3 |
| | * | wrong additions | kira0204 | 2018-03-06 | 2 | -3/+22 |
* | | | Spelling | Miheer Dewaskar | 2018-03-11 | 1 | -2/+2 |
* | | | Extrac comment and typo | Miheer Dewaskar | 2018-03-11 | 1 | -1/+2 |
* | | | Workaround for MacOS transparent proxy | Miheer Dewaskar | 2018-03-11 | 1 | -2/+37 |
|/ / | |||||
* | | fix docstring | Thomas Kriechbaumer | 2018-03-10 | 1 | -1/+1 |
* | | Merge pull request #2985 from hcbarry/master | Thomas Kriechbaumer | 2018-03-10 | 1 | -4/+4 |
|\ \ | |||||
| * | | Typo fix | Barry Lee | 2018-03-10 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #2977 from mitmproxy/updocs2 | Aldo Cortesi | 2018-03-08 | 11 | -429/+324 |
|\ \ | |||||
| * | | release: fix PR detection for appveyor | Aldo Cortesi | 2018-03-08 | 1 | -1/+3 |
| * | | release: put branches in /branches on the snapshots server | Aldo Cortesi | 2018-03-08 | 1 | -1/+3 |
| * | | release: build snapshots for all branches on the main repo | Aldo Cortesi | 2018-03-08 | 1 | -3/+2 |
| * | | release: don't upload assets for PRs from the main repo | Aldo Cortesi | 2018-03-08 | 2 | -1/+16 |
| * | | release: clean rtool | Aldo Cortesi | 2018-03-07 | 1 | -79/+0 |
| * | | docs: cloudfront invalidation | Aldo Cortesi | 2018-03-07 | 3 | -8/+8 |
| * | | release: build wheel | Aldo Cortesi | 2018-03-07 | 3 | -15/+12 |
| * | | release: shift appveyor to new process | Aldo Cortesi | 2018-03-07 | 4 | -52/+47 |
| * | | release: satisfy lint | Aldo Cortesi | 2018-03-07 | 1 | -30/+1 |
| * | | release: cleanup and re-enable all our Travis tests | Aldo Cortesi | 2018-03-07 | 2 | -36/+33 |
| * | | release: revamped release upload process | Aldo Cortesi | 2018-03-07 | 7 | -300/+280 |
| * | | docs: enable upload to docs.mitmproxy.org/master | Aldo Cortesi | 2018-03-07 | 3 | -33/+49 |