aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * Prevent flowview from creating duplicated windowsChoongwoo Han2015-10-041-0/+2
* | | fix #811Maximilian Hils2015-11-011-6/+5
|/ /
* | Merge pull request #805 from Badg/patch-1Maximilian Hils2015-10-231-1/+1
|\ \
| * | Ubuntu install missing libjpeg8-dev, zlib1g-devNick Badger2015-10-221-1/+1
| * | Update ubuntu installation to includ libjpegNick Badger2015-10-221-1/+1
|/ /
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-10-221-1/+1
|\ \
| * \ Merge pull request #801 from ben-lerner/doc_fixMaximilian Hils2015-10-141-1/+1
| |\ \
| | * | doc typo fixBen Lerner2015-10-131-1/+1
| |/ /
* / / fix #800Maximilian Hils2015-10-221-1/+2
|/ /
* | update web builds, use watchifyMaximilian Hils2015-10-0821-4510/+5852
* | Merge pull request #797 from colinbendell/colinbendell-patch-1Maximilian Hils2015-10-081-2/+2
|\ \
| * | 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 pull request #792 from tunz/patch-1Maximilian Hils2015-10-041-1/+1
|\ \ | |/ |/|
| * Update CONTRIBUTING.mdChoongwoo Han2015-10-041-1/+1
|/
* Merge remote-tracking branch 'origin/master'Maximilian Hils2015-10-031-1/+1
|\
| * Merge pull request #788 from sethp-jive/patch-1Maximilian Hils2015-10-011-1/+1
| |\
| | * Allow reading scripts from an anonymous pipesethp-jive2015-09-301-1/+1
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:24:50 +0000