aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bump versionMaximilian Hils2015-12-032-26/+28
* use version specifiers compatible with old setuptools releasesMaximilian Hils2015-12-031-22/+21
* Revert "make setup.py wheel-ready"Maximilian Hils2015-12-032-49/+66
* make setup.py wheel-readyMaximilian Hils2015-12-032-66/+49
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-12-031-3/+21
|\
| * appveyor: deploy binaries to snapshot serverMaximilian Hils2015-12-031-1/+11
| * appveyor: build binariesMaximilian Hils2015-12-031-3/+11
* | flow format compat: 0.14 -> 0.15Maximilian Hils2015-12-031-2/+9
* | test flow conversionMaximilian Hils2015-12-033-0/+87
|/
* fix #839Maximilian Hils2015-12-021-2/+4
* travis: retry snapshot uploadMaximilian Hils2015-12-021-1/+1
* add tnetstring inspection toolMaximilian Hils2015-12-021-0/+32
* add import capability for old flows, fix #840Maximilian Hils2015-12-022-7/+39
* remove docs from sdistMaximilian Hils2015-11-291-1/+0
* travis: don't install virtualenv manuallyMaximilian Hils2015-11-291-1/+0
* travis: fix osx binary build conditionMaximilian Hils2015-11-291-1/+1
* travis: build binaries on osxMaximilian Hils2015-11-291-4/+17
* disable concurrency tests on appveyorMaximilian Hils2015-11-292-2/+3
* lessen test race conditionsMaximilian Hils2015-11-292-2/+2
* add new pyinstaller spec filesMaximilian Hils2015-11-296-99/+42
* fix #847Maximilian Hils2015-11-272-3/+3
* remove unnecessary race conditions in testsMaximilian Hils2015-11-271-8/+2
* add memoryleak debug scriptMaximilian Hils2015-11-261-0/+38
* fix #831Maximilian Hils2015-11-261-1/+1
* http: catch all exceptionsMaximilian Hils2015-11-261-7/+6
* simplify Client/ServerConnection.__repr__Maximilian Hils2015-11-261-6/+4
* establish tls with client even if server connection failsMaximilian Hils2015-11-261-2/+1
* script reloader: minor fixesMaximilian Hils2015-11-261-0/+3
* travis: add OSX testsMaximilian Hils2015-11-261-0/+10
* fix #842Maximilian Hils2015-11-262-11/+26
* skip timing tests on appveyorMaximilian Hils2015-11-243-5/+18
* disable script reloaderMaximilian Hils2015-11-241-1/+1
* Merge branch 'travis-contentviews'Maximilian Hils2015-11-201-1/+1
|\
| * travis: test optional content views as wellMaximilian Hils2015-11-071-1/+1
* | Merge pull request #836 from MatthewShao/fix#835Maximilian Hils2015-11-181-1/+2
|\ \
| * | fix #835 , can display unicode character correctlyMatthew Shao2015-11-161-1/+2
|/ /
* | fix appveyor race conditions in testsMaximilian Hils2015-11-141-6/+4
* | fix HTTPS Proxy-Authentication, refs #824Maximilian Hils2015-11-142-1/+7
* | finalize script reloading :tada:Maximilian Hils2015-11-146-58/+96
* | structure libmproxy.scriptMaximilian Hils2015-11-1411-223/+293
|\ \
| * | Decouple libmproxy.script from libmproxy.flowMatthew Shao2015-11-133-18/+25
| * | Move the observer initalization to the constructor of ScriptMatthew Shao2015-11-112-9/+9
| * | Use watchdog to reload scripts automatically.Matthew Shao2015-11-113-0/+27
* | | minor stylistic fixesMaximilian Hils2015-11-143-17/+16
* | | Merge pull request #833 from zbuc/contentview_scriptsMaximilian Hils2015-11-137-28/+198
|\ \ \
| * | | Feedback from PR #832Chris Czub2015-11-137-106/+134
| * | | Add custom content view plugin support for mitmproxy/mitmdumpChris Czub2015-11-134-1/+111
| * | | Add new contentviews' content type mappingsChris Czub2015-11-132-0/+11
| * | | Add "add" ContentView method & testChris Czub2015-11-132-0/+21
* | | | Merge pull request #821 from zbuc/protobuf_contentview_test_fixMaximilian Hils2015-11-131-1/+1
|\ \ \ \ | |/ / / |/| | |