Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | simplify install instructions | Maximilian Hils | 2019-11-20 | 1 | -61/+36 |
| | |||||
* | Merge pull request #3669 from jannst/add_howto_install_android_system_ca | Thomas Kriechbaumer | 2019-11-11 | 1 | -0/+86 |
|\ | | | | | Add howto insert mitmproxy CA cert into the android system certificate store | ||||
| * | Adding tutorial on how to insert mitmproxy CA cert into the android system ↵ | jannst | 2019-10-13 | 1 | -0/+86 |
| | | | | | | | | certificate store | ||||
* | | grammer correction (#3670) | Will | 2019-10-15 | 1 | -1/+1 |
|/ | |||||
* | Update howto-transparent-vms.md for newer versions (#3597) | Nirusu | 2019-09-30 | 1 | -4/+10 |
| | | | Update howto-transparent-vms.md for newer versions | ||||
* | Merge pull request #3329 from Kriechi/readme-slogan | Thomas Kriechbaumer | 2019-09-28 | 1 | -4/+5 |
|\ | | | | | update readme slogan | ||||
| * | update readme slogan | Thomas Kriechbaumer | 2018-09-21 | 1 | -4/+5 |
| | | |||||
* | | Merge pull request #3603 from tomsaleeba/patch-1 | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+25 |
|\ \ | | | | | | | Transparent proxy on Linux for local originating traffic | ||||
| * | | docs: correct command to install mitmproxy | Tom Saleeba | 2019-08-01 | 1 | -1/+3 |
| | | | |||||
| * | | docs: add instructions for transparent proxy on Linux for traffic ↵ | Tom Saleeba | 2019-08-01 | 1 | -0/+23 |
| | | | | | | | | | | | | originating from the mitmproxy host itself | ||||
* | | | Merge pull request #3600 from king6cong/master | Thomas Kriechbaumer | 2019-09-28 | 1 | -11/+5 |
|\ \ \ | | | | | | | | | fix pf.conf on macOS | ||||
| * | | | fix pf.conf on macOS | king6cong | 2019-07-30 | 1 | -11/+5 |
| |/ / | |||||
* / / | Update concepts-certificates.md | Adam Hopkins | 2019-09-24 | 1 | -0/+3 |
|/ / | | | | | Update to direct people to using Safari instead of another browser on iOS. | ||||
* | | Merge pull request #3542 from ZHRhodes/patch-1 | Maximilian Hils | 2019-07-17 | 1 | -1/+1 |
|\ \ | | | | | | | Typo in howto-wireshark-tls.md | ||||
| * | | Update howto-wireshark-tls.md | ZHRhodes | 2019-05-16 | 1 | -1/+1 |
| | | | | | | | | | Fixed a typo in describing the master keys | ||||
* | | | Minor fix re. macOS steps | Lucio Paiva | 2019-06-26 | 1 | -2/+2 |
|/ / | |||||
* | | Fix markdown typo on addons-scripting.md | Rob Wills | 2019-03-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3441 from petersmythe/patch-1 | Maximilian Hils | 2019-01-23 | 2 | -2/+2 |
|\ \ | | | | | | | Fix spelling issues | ||||
| * | | Fix space | Peter Smythe | 2019-01-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fix spelling | Peter Smythe | 2019-01-03 | 1 | -1/+1 |
| | | | |||||
* | | | openbsd: divert-to requires exact listen address | Jihyun Yu | 2019-01-18 | 1 | -1/+1 |
|/ / | | | | | | | | | divert-to does not work with '0.0.0.0' or similar listen address, so we need to specify listen address that we provided to `pf`. | ||||
* | | docs: don't make links extra bold | Maximilian Hils | 2018-11-09 | 1 | -1/+1 |
| | | |||||
* | | docs: Add mitm.it link in the certificates docs. | Abhigyan Khaund | 2018-11-05 | 1 | -1/+1 |
| | | |||||
* | | Fixed doc about domain whitelisting | Tey | 2018-10-05 | 1 | -5/+11 |
|/ | |||||
* | Merge pull request #3186 from andersonvom/master | Aldo Cortesi | 2018-07-11 | 1 | -1/+16 |
|\ | | | | | Add scripting example to intercept & change requests | ||||
| * | Add example to intercept/change specific requests | Anderson Mesquita | 2018-06-16 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | This example captures requests to a specific URL and returns an arbitrary response instead. It's common enough that is useful to have in the docs. It also adds links to the Request and Response classes to help developers writing scripts. | ||||
| * | Rename scripting file | Anderson Mesquita | 2018-06-08 | 1 | -1/+1 |
| | | | | | | | | | | In order to add the more scripting examples, it makes sense to rename this file and avoid confusion. | ||||
* | | Update howto-transparent.md | bunnyhero | 2018-07-05 | 1 | -3/+3 |
|/ | | | | | i got a syntax error on macOS high sierra with the existing example pf.conf line. based on sample pf rules i found online, i believe it was missing the `pass` keyword, which i added. also, the surrounding text refers to "two lines," when there is only one, so i've updated that too. | ||||
* | docs: minor improvements to Windows installation | Maximilian Hils | 2018-05-16 | 1 | -7/+6 |
| | |||||
* | docs: complete, informative documentation on our SOCKS5 mode | Aldo Cortesi | 2018-05-16 | 1 | -3/+1 |
| | |||||
* | docs: installation, WSL | Aldo Cortesi | 2018-05-16 | 2 | -6/+14 |
| | |||||
* | docs: clarify binary packaage admonition | Aldo Cortesi | 2018-05-15 | 1 | -13/+12 |
| | |||||
* | docs: console key binding docs and example | Aldo Cortesi | 2018-05-15 | 1 | -0/+18 |
| | |||||
* | docs: split out tool documentation | Aldo Cortesi | 2018-05-15 | 5 | -39/+51 |
| | |||||
* | cadir -> confdir | Aldo Cortesi | 2018-05-10 | 1 | -4/+4 |
| | | | | | We store a lot more than just the CAs in our configuration directory. Clarify the option name. | ||||
* | Merge pull request #2986 from miheerdew/patch-1 | Thomas Kriechbaumer | 2018-05-06 | 1 | -2/+36 |
|\ | | | | | Workaround for MacOS transparent proxy | ||||
| * | Merge master | Miheer Dewaskar | 2018-03-24 | 13 | -146/+167 |
| |\ | |||||
| * | | 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 |
| | | | | | | | | | This workaround (adopted from #1261) allows MacOS users to redirect their machine's outgoing traffic to mitmproxy transparently. | ||||
* | | | Fix typo in addons-overview.md | Simon Elvery | 2018-05-05 | 1 | -1/+1 |
| | | | |||||
* | | | Changed syntax from v2 to v3 | p1uymi | 2018-04-26 | 1 | -3/+3 |
| | | | | | | | | | | | | --client-certs = v2 syntax --> --set client_certs=value = v3 syntax --cadir = v2 syntax --> --set cadir=value = v3 syntax | ||||
* | | | fix GA id | Maximilian Hils | 2018-04-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3025 from Kriechi/py36 | Aldo Cortesi | 2018-04-01 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Python 3.5 is dead -- long live Python 3.6! | ||||
| * | | | Python 3.5 is dead -- long live Python 3.6! | Thomas Kriechbaumer | 2018-03-31 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | fixes #2266 | ||||
* | | | | Update addons-overview.md | ghillu | 2018-04-01 | 1 | -2/+2 |
|/ / / | | | | | | | Fixed a typo | ||||
* | | | Merge pull request #3012 from Kriechi/docs-options | Aldo Cortesi | 2018-03-30 | 5 | -57/+29 |
|\ \ \ | | | | | | | | | docs: add auto-generated options reference | ||||
| * | | | docs: add auto-generated options reference | Thomas Kriechbaumer | 2018-03-25 | 5 | -57/+29 |
| | |/ | |/| | |||||
* / | | Fixed Typo in Transparent Proxy Setup for Mac | Michael Shi | 2018-03-26 | 1 | -1/+1 |
|/ / | | | | | Fixed typo referencing `en2` when it should mention `en0` | ||||
* | | various docs improvements | Maximilian Hils | 2018-03-21 | 9 | -54/+77 |
| | | | | | | | | | | | | | | - add clickable anchors for headers - add "outdated" warning for archived docs - add "edit on github" button - beautify template |