| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | 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 | |
| |\| | ||||||
| * | | 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 | |
| |\ | | | | | Support multiple scripts and script arguments. refs #76 | |||||
| | * | 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 | |
| | | | | | | | | | | | Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png). /sdcard/Download (singular) is the correct path. | |||||
| * | | 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 | |
| |\ \ | |/ |/| | Documentation for adding a new content viewer / View class | |||||
| | * | Finalizing documentation | Jason A. Novak | 2013-04-21 | 2 | -3/+2 | |
| | | | ||||||
| | * | Further cleanup of documentation | Jason A. Novak | 2013-04-21 | 2 | -8/+9 | |
| | | | ||||||
| | * | More documentation cleanup and formatting | Jason A. Novak | 2013-04-21 | 2 | -7/+16 | |
| | | | ||||||
| | * | More documentation | Jason A. Novak | 2013-04-21 | 1 | -6/+3 | |
| | | | ||||||
| | * | More documentation | Jason A. Novak | 2013-04-21 | 1 | -3/+5 | |
| | | | ||||||
| | * | Continue work on documentation of adding views | Jason A. Novak | 2013-04-21 | 1 | -1/+2 | |
| | | | ||||||
| | * | Begin work on documenting adding a new view | Jason A. Novak | 2013-04-21 | 4 | -2/+31 | |
| | | | ||||||
| * | | Styling. | Aldo Cortesi | 2013-05-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | Mods to "How mitmproxy works" | Aldo Cortesi | 2013-05-14 | 1 | -17/+74 | |
| | | | ||||||
| * | | README, Linux transparent mode docs, requirements additions. | Aldo Cortesi | 2013-05-14 | 3 | -8/+52 | |
| | | | ||||||
| * | | Adapt docs for website embedding. | Aldo Cortesi | 2013-04-30 | 3 | -3/+6 | |
| |/ | ||||||
| * | Docs. | Aldo Cortesi | 2013-04-05 | 3 | -103/+61 | |
| | | ||||||
| * | Update styling, GameCenter highscore tutorial. | Aldo Cortesi | 2013-03-18 | 11 | -48/+124 | |
| | | ||||||
| * | Add filter to mitmdump examples. | Aldo Cortesi | 2013-03-17 | 1 | -4/+18 | |
| | | ||||||
| * | Update Android cert install documents. | Aldo Cortesi | 2013-03-17 | 1 | -18/+11 | |
| | | ||||||
| * | Add instructions for installing the CA in the IOS Simulator. | Aldo Cortesi | 2013-03-17 | 5 | -18/+41 | |
| | | ||||||
| * | Introduce a filtered flow writer, and use it in dump.py | Aldo Cortesi | 2013-03-14 | 1 | -1/+1 | |
| | | | | | Fixes #104 | |||||
| * | Docs, examples. | Aldo Cortesi | 2013-03-11 | 10 | -42/+81 | |
| | | ||||||
| * | Expand "How mitmproxy works". Clean up some un-needed sections. | Aldo Cortesi | 2013-03-10 | 7 | -1049/+164 | |
| | | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |