Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy

This commit is contained in:
Aldo Cortesi 2015-05-23 09:44:28 +12:00
commit 3161a5be22
5 changed files with 6716 additions and 9 deletions

6
.env
View File

@ -1,5 +1,5 @@
DIR=`dirname $0` DIR="${0%/*}"
if [ -z "$VIRTUAL_ENV" ] && [ -f $DIR/../venv.mitmproxy/bin/activate ]; then if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then
echo "Activating mitmproxy virtualenv..." echo "Activating mitmproxy virtualenv..."
source $DIR/../venv.mitmproxy/bin/activate source "$DIR/../venv.mitmproxy/bin/activate"
fi fi

File diff suppressed because one or more lines are too long

6707
doc-src/01-vendor.css Normal file

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,12 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="@!urlTo(idxpath)!@">mitmproxy $!VERSION!$ docs</a> <a class="navbar-brand" href="@!urlTo("/index.html")!@">
<img height="20px" src="@!urlTo("mitmproxy-long.png")!@"/>
</a>
</div>
<div class="navbar-header navbar-right">
<a class="navbar-brand" hre="#">$!VERSION!$ docs</a>
</div> </div>
</div> </div>
</div> </div>

BIN
doc-src/mitmproxy-long.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB