Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-10-23 | 9 | -181/+244 |
|\ | | | | | | | | | Conflicts: doc-src/modes.html | ||||
| * | Document http2https and https2http | Aldo Cortesi | 2014-10-23 | 2 | -1/+30 |
| | | |||||
| * | Correct docs - we no longer support change of basic proxy mode in the ↵ | Aldo Cortesi | 2014-10-23 | 2 | -6/+0 |
| | | | | | | | | console app | ||||
| * | More refactoring of installation docs | Aldo Cortesi | 2014-10-23 | 1 | -1/+15 |
| | | | | | | | | | | | | - Make it clear that README.md only has the hacking installation instructions - Beef up install.html | ||||
| * | Keep sidebar ordering alphabetical, add SOCKS documentation | Aldo Cortesi | 2014-10-23 | 3 | -4/+16 |
| | | |||||
| * | First redraft of modes documentation | Aldo Cortesi | 2014-10-23 | 1 | -143/+155 |
| | | |||||
| * | Documentation re-org | Aldo Cortesi | 2014-10-23 | 3 | -30/+32 |
| | | | | | | | | | | | | - No longer using README.md in the rendered documentation. - Rendered doc instrutions are now for the released version of mitmproxy, with dev install instructions in the README.md | ||||
* | | fix typo | Maximilian Hils | 2014-10-23 | 1 | -1/+1 |
| | | |||||
* | | update proxy modes diagrams | Maximilian Hils | 2014-10-23 | 4 | -0/+0 |
|/ | |||||
* | fix #378 | Maximilian Hils | 2014-10-22 | 1 | -3/+19 |
| | |||||
* | add generic tcp proxying, fix #374 | Maximilian Hils | 2014-10-18 | 5 | -5/+45 |
| | |||||
* | docs: make sure that inline script devs don't miss the examples | Maximilian Hils | 2014-09-14 | 1 | -2/+9 |
| | |||||
* | Docs stub for Unbuntu, restore executable flag on binaries. | Aldo Cortesi | 2014-09-09 | 1 | -0/+19 |
| | |||||
* | add note about icmp redirects, fix #255 | Maximilian Hils | 2014-09-08 | 1 | -0/+10 |
| | |||||
* | document --ignore, fix #350 | Maximilian Hils | 2014-09-08 | 3 | -9/+90 |
| | |||||
* | add mitm.it error site | Maximilian Hils | 2014-09-07 | 2 | -0/+6 |
| | |||||
* | Merge pull request #347 from mitmproxy/issue_341 | Aldo Cortesi | 2014-09-07 | 1 | -27/+26 |
|\ | | | | | Remove BackReferenceMixin | ||||
| * | Merge branch 'issue_341' into server_change_api | Maximilian Hils | 2014-09-06 | 2 | -0/+0 |
| |\ | |||||
| * | | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93 | Maximilian Hils | 2014-09-05 | 1 | -27/+26 |
| | | | |||||
* | | | docs: mitmproxy now displays the reverse proxy server unless --host is ↵ | Maximilian Hils | 2014-09-07 | 1 | -3/+0 |
| | | | | | | | | | | | | specified, which comes with a pretty big warning itself | ||||
* | | | add docs on proxy modes | Maximilian Hils | 2014-09-07 | 24 | -1/+247 |
| |/ |/| | |||||
* | | add architecture illustration | Maximilian Hils | 2014-09-05 | 2 | -0/+0 |
|/ | |||||
* | docs: add docs for script args, fix #293 | Maximilian Hils | 2014-08-07 | 1 | -8/+22 |
| | |||||
* | docs: suggest to use inline scripts rather than libmproxy | Maximilian Hils | 2014-08-07 | 1 | -0/+10 |
| | |||||
* | Merge branch 'stream' | Maximilian Hils | 2014-07-31 | 4 | -1/+61 |
|\ | | | | | | | | | Conflicts: libmproxy/protocol/http.py | ||||
| * | docs++ | Maximilian Hils | 2014-07-25 | 1 | -35/+33 |
| | | |||||
| * | response streaming doc | Brad Peabody | 2014-07-24 | 4 | -1/+63 |
| | | |||||
* | | add proxy modes illustrations, refs #258 | Maximilian Hils | 2014-07-31 | 4 | -0/+0 |
|/ | |||||
* | update firefox cert install docs | Maximilian Hils | 2014-04-10 | 1 | -2/+2 |
| | |||||
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 4 | -8/+8 |
| | |||||
* | Merge branch 'absolutely_relative_proxying' | Maximilian Hils | 2014-03-10 | 2 | -15/+15 |
|\ | |||||
| * | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 1 | -14/+14 |
| | | |||||
| * | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 1 | -1/+1 |
| | | |||||
* | | Update webapp.html | Bennett Blodinger | 2014-03-08 | 1 | -0/+3 |
|/ | | | Add notice about data compression proxies | ||||
* | merge master | Maximilian Hils | 2014-01-28 | 94 | -0/+5766 |
|\ | |||||
| * | docs: fix spacing of page headers | Aldo Cortesi | 2014-01-28 | 1 | -1/+5 |
| | | |||||
| * | Adjust docs for web app certificate installation. | Aldo Cortesi | 2014-01-28 | 9 | -37/+75 |
| | | |||||
| * | Instructions for adding mitmproxy certificates to the Java trust store. | Aldo Cortesi | 2014-01-27 | 3 | -0/+15 |
| | | | | | | | | Fixes #146 | ||||
| * | Android doc update. | Aldo Cortesi | 2014-01-27 | 1 | -2/+5 |
| | | |||||
| * | Revert "Move the doc tree out into its own repo." | Aldo Cortesi | 2014-01-27 | 91 | -0/+5706 |
| | | | | | | | | This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf. | ||||
* | | merge master | Maximilian Hils | 2014-01-22 | 89 | -5730/+0 |
|\| | |||||
| * | Move the doc tree out into its own repo. | Aldo Cortesi | 2014-01-22 | 91 | -5706/+0 |
| | | |||||
| * | Doc and readme tweaks. | Aldo Cortesi | 2014-01-19 | 4 | -11/+31 |
| | | |||||
| * | Refactor docs to define nav sidebar in only one place. | Aldo Cortesi | 2014-01-19 | 4 | -95/+51 |
| | | |||||
| * | Optionally take the mitmproxy path for doc rendering from a env variable. | Aldo Cortesi | 2014-01-19 | 1 | -1/+1 |
| | | |||||
* | | merge master | Maximilian Hils | 2014-01-18 | 14 | -19/+85 |
|\| | |||||
| * | fix syntax highlighting for countershape urls by using different quotes | Maximilian Hils | 2014-01-14 | 6 | -16/+16 |
| | | |||||
| * | add tutorial for transparent proxying, other minor docs improvements | Maximilian Hils | 2014-01-14 | 10 | -9/+75 |
| | | |||||
* | | Delete ~$$proxy-flowchart.~vsdx | Maximilian Hils | 2014-01-07 | 1 | -0/+0 |
| | | |||||
* | | continue work on the proxyhandler | Maximilian Hils | 2014-01-07 | 2 | -0/+0 |
|\| |