aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
Commit message (Expand)AuthorAgeFilesLines
* docs: make sure that inline script devs don't miss the examplesMaximilian Hils2014-09-141-2/+9
* Docs stub for Unbuntu, restore executable flag on binaries.Aldo Cortesi2014-09-091-0/+19
* add note about icmp redirects, fix #255Maximilian Hils2014-09-081-0/+10
* document --ignore, fix #350Maximilian Hils2014-09-083-9/+90
* add mitm.it error siteMaximilian Hils2014-09-072-0/+6
* Merge pull request #347 from mitmproxy/issue_341Aldo Cortesi2014-09-071-27/+26
|\
| * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-062-0/+0
| |\
| * | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93Maximilian Hils2014-09-051-27/+26
* | | docs: mitmproxy now displays the reverse proxy server unless --host is specif...Maximilian Hils2014-09-071-3/+0
* | | add docs on proxy modesMaximilian Hils2014-09-0724-1/+247
| |/ |/|
* | add architecture illustrationMaximilian Hils2014-09-052-0/+0
|/
* docs: add docs for script args, fix #293Maximilian Hils2014-08-071-8/+22
* docs: suggest to use inline scripts rather than libmproxyMaximilian Hils2014-08-071-0/+10
* Merge branch 'stream'Maximilian Hils2014-07-314-1/+61
|\
| * docs++Maximilian Hils2014-07-251-35/+33
| * response streaming docBrad Peabody2014-07-244-1/+63
* | add proxy modes illustrations, refs #258Maximilian Hils2014-07-314-0/+0
|/
* update firefox cert install docsMaximilian Hils2014-04-101-2/+2
* forward proxy -> upstream proxyMaximilian Hils2014-03-144-8/+8
* Merge branch 'absolutely_relative_proxying'Maximilian Hils2014-03-102-15/+15
|\
| * update docs, fix #215Maximilian Hils2014-03-101-14/+14
| * add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-101-1/+1
* | Update webapp.htmlBennett Blodinger2014-03-081-0/+3
|/
* merge masterMaximilian Hils2014-01-2894-0/+5766
|\
| * docs: fix spacing of page headersAldo Cortesi2014-01-281-1/+5
| * Adjust docs for web app certificate installation.Aldo Cortesi2014-01-289-37/+75
| * Instructions for adding mitmproxy certificates to the Java trust store.Aldo Cortesi2014-01-273-0/+15
| * Android doc update.Aldo Cortesi2014-01-271-2/+5
| * Revert "Move the doc tree out into its own repo."Aldo Cortesi2014-01-2791-0/+5706
* | merge masterMaximilian Hils2014-01-2289-5730/+0
|\|
| * Move the doc tree out into its own repo.Aldo Cortesi2014-01-2291-5706/+0
| * Doc and readme tweaks.Aldo Cortesi2014-01-194-11/+31
| * Refactor docs to define nav sidebar in only one place.Aldo Cortesi2014-01-194-95/+51
| * Optionally take the mitmproxy path for doc rendering from a env variable.Aldo Cortesi2014-01-191-1/+1
* | merge masterMaximilian Hils2014-01-1814-19/+85
|\|
| * fix syntax highlighting for countershape urls by using different quotesMaximilian Hils2014-01-146-16/+16
| * add tutorial for transparent proxying, other minor docs improvementsMaximilian Hils2014-01-1410-9/+75
* | Delete ~$$proxy-flowchart.~vsdxMaximilian Hils2014-01-071-0/+0
* | continue work on the proxyhandlerMaximilian Hils2014-01-072-0/+0
|\|
* | first steps on tcp proxyingMaximilian Hils2014-01-053-0/+0
|/
* merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-161-0/+5
|\
* | add @concurrent decorator for inline scripts, fixes #176Maximilian Hils2013-12-151-0/+7
|/
* change certificate path for android, fix #171Maximilian Hils2013-12-121-2/+2
* Added small note of file formatJames Billingham2013-12-111-0/+3
* Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-111-1/+1
|\
| * Bump versionAldo Cortesi2013-12-101-1/+1
* | add documentation on how to use custom certificatesMaximilian Hils2013-12-111-0/+14
|/
* Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-081-1/+1
|\
| * add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-131-1/+1
* | Add a note to the docs about pf redirection of traffic from the host itself.Aldo Cortesi2013-12-081-0/+12