aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Client-side cleanupAldo Cortesi2014-09-1510-280/+110
* fix missing timeout parameterMaximilian Hils2014-09-141-1/+1
* docs: make sure that inline script devs don't miss the examplesMaximilian Hils2014-09-141-2/+9
* Web interface is live.Aldo Cortesi2014-09-143-8080/+4
* checkin assetsMaximilian Hils2014-09-146-0/+56563
* include jshint-stylish dependencyMaximilian Hils2014-09-142-2/+3
* Add tornado dependency, serve index fileAldo Cortesi2014-09-144-4/+24
* Basic web service and optionsAldo Cortesi2014-09-144-6/+60
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-09-1411-44/+15542
|\
| * web: add flow stubMaximilian Hils2014-09-143-26/+2066
| * gulpfile: add tests and notifyMaximilian Hils2014-09-148-18/+13476
* | Remove external app option, make tick timeout explicitAldo Cortesi2014-09-148-48/+14
* | Super-basic outline for web io loopAldo Cortesi2014-09-1412-6/+8737
|/
* update GruntfileMaximilian Hils2014-09-138-21/+32
* web: start guiMaximilian Hils2014-09-1316-66/+5722
* gulpfileMaximilian Hils2014-09-1317-62/+8756
* use bowser-installerMaximilian Hils2014-09-13181-80501/+21
* fix testsMaximilian Hils2014-09-121-2/+2
* update iframe injector example to use BeautifulSoupMaximilian Hils2014-09-121-6/+10
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-09-121-0/+1
|\
| * update gitignoreMaximilian Hils2014-09-111-0/+1
* | web -> onboardingAldo Cortesi2014-09-1227-8255/+1485
|/
* Client-side framework for web applicationAldo Cortesi2014-09-10205-198/+146552
* Reorg to put web app in its own directoryAldo Cortesi2014-09-1020-3/+4
* Docs stub for Unbuntu, restore executable flag on binaries.Aldo Cortesi2014-09-093-0/+19
* polish new distribution setupMaximilian Hils2014-09-093-3/+4
* Update README.mkdMaximilian Hils2014-09-091-6/+21
* fix jsunpacker importsMaximilian Hils2014-09-092-2/+2
* update travis.ymlMaximilian Hils2014-09-091-5/+2
* update distribution: pip install now works on WindowsMaximilian Hils2014-09-093-54/+74
* re-add mitmproxy/mitmdump scripts for convenienceMaximilian Hils2014-09-083-1/+7
* mitmproxy -> libmproxy.main. do some leanup on the wayMaximilian Hils2014-09-0813-180/+213
* add note about icmp redirects, fix #255Maximilian Hils2014-09-081-0/+10
* update examples, fix #353Maximilian Hils2014-09-0820-133/+141
* remove proxy mode abstraction: always be clear which mode we are inMaximilian Hils2014-09-088-71/+94
* document --ignore, fix #350Maximilian Hils2014-09-084-10/+92
* improve loggingMaximilian Hils2014-09-081-7/+19
* add --ignore ui indicationMaximilian Hils2014-09-086-11/+56
* add note that request.host should be used in the majority of casesMaximilian Hils2014-09-071-0/+3
* improve change_server api, add example how to change the upstream serverMaximilian Hils2014-09-073-13/+41
* fix #349Maximilian Hils2014-09-073-6/+19
* add mitm.it error siteMaximilian Hils2014-09-072-0/+6
* update code docs, make sure that url attribute never returns prettified/forma...Maximilian Hils2014-09-071-4/+10
* Merge pull request #347 from mitmproxy/issue_341Aldo Cortesi2014-09-0742-1115/+1113
|\
| * Merge pull request #342 from mitmproxy/server_change_apiAldo Cortesi2014-09-0734-711/+779
| |\
| | * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-064-6/+17
| | |\ | | |/ | |/|
| * | Merge branch 'master' into issue_341Maximilian Hils2014-09-065-12/+36
| |\ \
| | | * fix race condition with the concurrent decoratorMaximilian Hils2014-09-061-6/+19
| | | * streamline HTTPHandler.handle_flow()Maximilian Hils2014-09-051-95/+96
| | | * update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93Maximilian Hils2014-09-0520-166/+176