aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* fix #847Maximilian Hils2015-11-272-3/+3
* 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
* fix #842Maximilian Hils2015-11-262-11/+26
* disable script reloaderMaximilian Hils2015-11-241-1/+1
* fix #835 , can display unicode character correctlyMatthew Shao2015-11-161-1/+2
* fix HTTPS Proxy-Authentication, refs #824Maximilian Hils2015-11-142-1/+7
* finalize script reloading :tada:Maximilian Hils2015-11-145-58/+95
* structure libmproxy.scriptMaximilian Hils2015-11-149-210/+279
|\
| * 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-142-6/+3
* | Feedback from PR #832Chris Czub2015-11-133-84/+51
* | Add custom content view plugin support for mitmproxy/mitmdumpChris Czub2015-11-132-1/+52
* | Add new contentviews' content type mappingsChris Czub2015-11-131-0/+10
* | Add "add" ContentView method & testChris Czub2015-11-131-0/+8
|/
* fix scripteditor bugMaximilian Hils2015-11-101-0/+1
* Bump version for next release cycleAldo Cortesi2015-11-071-1/+1
* Bump version, update CONTRIBUTORS, CHANGELOGAldo Cortesi2015-11-061-1/+1
* Catch and ignore thread errors on exitAldo Cortesi2015-11-061-3/+4
* 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
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-11-013-2/+7
|\ \
| * | 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
| | * Prevent flowview from creating duplicated windowsChoongwoo Han2015-10-041-0/+2
* | | fix #811Maximilian Hils2015-11-011-6/+5
|/ /
* | fix #800Maximilian Hils2015-10-221-1/+2
* | update web builds, use watchifyMaximilian Hils2015-10-086-4299/+5698
* | default should not be NoneColin Bendell2015-10-071-1/+1
* | Check if server connection hasn't yet been initiatedColin Bendell2015-10-071-2/+2
|/
* Merge remote-tracking branch 'origin/master'Maximilian Hils2015-10-031-1/+1
|\
| * Allow reading scripts from an anonymous pipesethp-jive2015-09-301-1/+1
* | fix #786Maximilian Hils2015-10-031-0/+5
|/
* fix #773Maximilian Hils2015-09-281-4/+14
* fix testsMaximilian Hils2015-09-281-1/+1
* Merge branch 'http-models'Maximilian Hils2015-09-289-88/+61
|\
| * adjust to netlib response changes + docsMaximilian Hils2015-09-267-38/+36
| * adjust to netlib request changes + docsMaximilian Hils2015-09-264-50/+25
* | handle Expect: 100-continue header, fix #770Maximilian Hils2015-09-283-5/+23
|/
* experimental: run tests using py.testsMaximilian Hils2015-09-211-0/+1
* fix minor bugs, add py.test compatibilityMaximilian Hils2015-09-211-1/+5