aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / / |/| | |
| * | | Fix failing protobuf contentview testChris Czub2015-11-061-1/+1
* | | | be more conservative about dependency versionsMaximilian Hils2015-11-131-21/+21
| |/ / |/| |
* | | fix scripteditor bugMaximilian Hils2015-11-101-0/+1
* | | docs++Maximilian Hils2015-11-071-13/+13
* | | Merge pull request #822 from ddworken/masterMaximilian Hils2015-11-071-0/+10
|\ \ \
| * | | Added information on cert pinning (Fixes #689)David Dworken2015-11-061-0/+10
|/ / /
* / / Bump version for next release cycleAldo Cortesi2015-11-071-1/+1
|/ /
* | Bump version, update CONTRIBUTORS, CHANGELOGAldo Cortesi2015-11-063-25/+85
* | Adjust pyinstaller spec pathsAldo Cortesi2015-11-062-2/+2
* | Catch and ignore thread errors on exitAldo Cortesi2015-11-061-3/+4
* | Merge pull request #819 from tekii/hotfix-broken-copyMaximilian Hils2015-11-051-2/+2
|\ \
| * | fix copy to clipboard command when copying contentMarcelo Glezer2015-11-051-2/+2
|/ /
* | Merge pull request #809 from zbuc/pfctl_errhandlingMaximilian Hils2015-11-041-2/+11
|\ \ | |/ |/|
| * PR 809 make code more pythonicChris Czub2015-11-041-2/+3
| * Declare & define insufficient_privChris Czub2015-10-291-0/+1
| * Better error handling/reporting for pfctl failures on OS XChris Czub2015-10-291-2/+9
* | docs: fix broken graphicMaximilian Hils2015-11-021-0/+0
* | docs: improve mode flowchartMaximilian Hils2015-11-022-0/+0
* | improve reverse proxy docsMaximilian Hils2015-11-021-3/+3
* | try to fix appveyor race conditions in testsMaximilian Hils2015-11-011-16/+4
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-11-013-2/+7
|\ \
| * \ Merge pull request #810 from gecko655/ctrl_fbMaximilian Hils2015-10-312-0/+5
| |\ \ | | |/ | |/|
| | * Use ctrl+f and ctrl+b to scroll a pagegecko6552015-10-302-0/+5
| |/
| * Merge pull request #791 from tunz/masterMaximilian Hils2015-10-281-2/+2
| |\
| | * Refresh flowview instead of reopen the same flowviewChoongwoo Han2015-10-081-4/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:23:32 +0000