| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #347 from mitmproxy/issue_341 | Aldo Cortesi | 2014-09-07 | 1 | -27/+26 |
|\ |
|
| * | 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 specif... | Maximilian Hils | 2014-09-07 | 1 | -3/+0 |
* | | | 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 |
|\ |
|
| * | 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 |
|/ |
|
* | 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 |
| * | 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 |
* | | 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 |
|\| |
|
* | | first steps on tcp proxying | Maximilian Hils | 2014-01-05 | 3 | -0/+0 |
|/ |
|
* | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 1 | -0/+5 |
|\ |
|
* | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 1 | -0/+7 |
|/ |
|
* | change certificate path for android, fix #171 | Maximilian Hils | 2013-12-12 | 1 | -2/+2 |
* | Added small note of file format | James Billingham | 2013-12-11 | 1 | -0/+3 |
* | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-11 | 1 | -1/+1 |
|\ |
|
| * | Bump version | Aldo Cortesi | 2013-12-10 | 1 | -1/+1 |
* | | add documentation on how to use custom certificates | Maximilian Hils | 2013-12-11 | 1 | -0/+14 |
|/ |
|
* | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 1 | -1/+1 |
|\ |
|
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -1/+1 |
* | | Add a note to the docs about pf redirection of traffic from the host itself. | Aldo Cortesi | 2013-12-08 | 1 | -0/+12 |
* | | Update android.html | joebowbeer | 2013-10-18 | 1 | -4/+3 |
* | | Minor adjustment for website docs pages. | Aldo Cortesi | 2013-06-16 | 1 | -0/+3 |
* | | Version bump, doc extension, URLs to github.com/mitmproxy/* | Aldo Cortesi | 2013-06-16 | 9 | -41/+108 |
* | | Merge pull request #119 from jasonanovak/ViewDocumentation | Aldo Cortesi | 2013-06-15 | 3 | -1/+39 |
|\ \
| |/
|/| |
|
| * | Finalizing documentation | Jason A. Novak | 2013-04-21 | 2 | -3/+2 |