aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Update android.htmljoebowbeer2013-10-181-4/+3
* | Minor adjustment for website docs pages.Aldo Cortesi2013-06-161-0/+3
* | Version bump, doc extension, URLs to github.com/mitmproxy/*Aldo Cortesi2013-06-169-41/+108
* | Merge pull request #119 from jasonanovak/ViewDocumentationAldo Cortesi2013-06-153-1/+39
|\ \ | |/ |/|
| * Finalizing documentationJason A. Novak2013-04-212-3/+2
| * Further cleanup of documentationJason A. Novak2013-04-212-8/+9
| * More documentation cleanup and formattingJason A. Novak2013-04-212-7/+16
| * More documentationJason A. Novak2013-04-211-6/+3
| * More documentationJason A. Novak2013-04-211-3/+5
| * Continue work on documentation of adding viewsJason A. Novak2013-04-211-1/+2
| * Begin work on documenting adding a new viewJason A. Novak2013-04-214-2/+31
* | Styling.Aldo Cortesi2013-05-151-1/+1
* | Mods to "How mitmproxy works"Aldo Cortesi2013-05-141-17/+74
* | README, Linux transparent mode docs, requirements additions.Aldo Cortesi2013-05-143-8/+52
* | Adapt docs for website embedding.Aldo Cortesi2013-04-303-3/+6
|/
* Docs.Aldo Cortesi2013-04-053-103/+61
* Update styling, GameCenter highscore tutorial.Aldo Cortesi2013-03-1811-48/+124
* Add filter to mitmdump examples.Aldo Cortesi2013-03-171-4/+18
* Update Android cert install documents.Aldo Cortesi2013-03-171-18/+11
* Add instructions for installing the CA in the IOS Simulator.Aldo Cortesi2013-03-175-18/+41
* Introduce a filtered flow writer, and use it in dump.pyAldo Cortesi2013-03-141-1/+1
* Docs, examples.Aldo Cortesi2013-03-1110-42/+81
* Expand "How mitmproxy works". Clean up some un-needed sections.Aldo Cortesi2013-03-107-1049/+164