aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improve dependency management in setup.pyMaximilian Hils2015-07-041-19/+24
|
* fix #648Maximilian Hils2015-07-041-2/+2
|
* clarify docsMaximilian Hils2015-07-041-2/+3
|
* fix #653Maximilian Hils2015-07-041-10/+15
|
* fix #593, fix #656, coverage++Maximilian Hils2015-07-033-53/+83
|
* fix windows compatibilityMaximilian Hils2015-07-032-2/+28
|
* Merge pull request #661 from kyle-m/masterAldo Cortesi2015-06-309-1/+205
|\ | | | | Enabling upstream server verification.
| * Enabling upstream server verification. Added flags --verify_upstream_cert,Kyle Morton2015-06-299-1/+205
|/ | | | --upstream-trusted-cadir, and --upstream-trusted-ca.
* synchronize metadata files across projectsMaximilian Hils2015-06-261-1/+4
|
* Merge branch 'appveyor2'Maximilian Hils2015-06-261-0/+11
|\
| * add appveyorMaximilian Hils2015-06-261-0/+11
| |
* | Merge pull request #654 from mitmproxy/remove_certforwardAldo Cortesi2015-06-274-41/+19
|\| | | | | Remove Certforward Feature
| * remove certforward featureMaximilian Hils2015-06-264-41/+19
| | | | | | | | | | | | | | | | The certforward feature was implemented to support #gotofail, which only works on unpatched iOS devices. Given that many apps don't support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option. By removing certforward, we can make netlib a pure python module again, which significantly simplifies distribution.
* | docs: fix certinstall image max-widthMaximilian Hils2015-06-261-1/+1
|/
* Remove stray print & massage whitespace a bitAldo Cortesi2015-06-251-9/+6
|
* Merge pull request #645 from elitest/hardfailvenvAldo Cortesi2015-06-242-2/+2
|\ | | | | Add a check to see if virtualenv is installed.
| * Merge branch 'master' into hardfailvenvJim Shaver2015-06-23206-15109/+74656
| |\ | |/ |/| | | | | Conflicts: dev
* | Merge pull request #640 from Kriechi/ssl-version-handlingAldo Cortesi2015-06-231-43/+25
|\ \ | | | | | | unify SSL version/method handling
| * | unify SSL version/method handlingThomas Kriechbaumer2015-06-231-43/+25
|/ /
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-06-238-5/+199
|\ \
| * \ Merge pull request #638 from iroiro123/http-transparentAldo Cortesi2015-06-238-5/+199
| |\ \ | | | | | | | | HTTP Transparent Proxy
| | * | changed error handling (ssl spoof mode)iroiro1232015-06-233-16/+12
| | | |
| | * | add unit tests for spoof modeiroiro1232015-06-233-0/+103
| | | |
| | * | SSL Spoof modeiroiro1232015-06-215-8/+65
| | | |
| | * | Spoof modeiroiro1232015-06-204-14/+21
| | | |
| | * | HTTP Transparent Proxyiroiro1232015-06-184-2/+33
| | | |
* | | | Travis to SlackAldo Cortesi2015-06-231-0/+5
|/ / /
* / / Update README.mkdMaximilian Hils2015-06-181-1/+0
|/ /
* | add landscape/prospector configThomas Kriechbaumer2015-06-183-21/+15
| |
* | Update README.mkdMaximilian Hils2015-06-161-4/+6
| |
* | fix pep8 configThomas Kriechbaumer2015-06-151-1/+0
| |
* | Handle invalid IDNA encoding in hostnamesAldo Cortesi2015-06-122-6/+12
| | | | | | | | Fixes #622
* | Fix typo in docs - thanks to Jim_Showalter@intuit.comAldo Cortesi2015-06-121-2/+2
| |
* | Merge pull request #624 from drahosj/masterAldo Cortesi2015-06-124-5/+63
|\ \ | | | | | | Added flow marking functionality in the console
| * | Added unmark all functionalityJake Drahos2015-06-111-0/+5
| | | | | | | | | | | | - 'U' to unmark all marked flows
| * | Moved marking from flow to consoleJake Drahos2015-06-115-26/+29
| | | | | | | | | | | | No longer taints the flow primitive
| * | Merge remote-tracking branch 'origin/master'Jake Drahos2015-06-110-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: libmproxy/console/flowlist.py
| | * | Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| | | | | | | | | | | | | | | | w (write) -> m (marked)
| * | | Changed mark symbolJake Drahos2015-06-111-2/+2
| | | | | | | | | | | | | | | | Smaller symbol now, still just as easy to see while scrolling
| * | | Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| |/ / | | | | | | | | | w (write) -> m (marked)
| * | Unmark duplicated flowsJake Drahos2015-06-111-1/+3
| | | | | | | | | | | | If a marked flow is duplicated, the duplicate will now be unmarked
| * | Changed symbols and colorsJake Drahos2015-06-112-2/+5
| | | | | | | | | | | | | | | Added a better symbol for the mark, and changed the color to red. This helps it stand out more easily.
| * | Fixed console rendering bugJake Drahos2015-06-111-2/+5
| | | | | | | | | | | | Clearing all flows now works properly
| * | Marked flows not deleted on clear allJake Drahos2015-06-112-4/+11
| | | | | | | | | | | | | | | | | | Marked flows survive a clear all unless all current flows are marked. Bug: They don't show up until another flow is added
| * | Implemented basic marking of flowsJake Drahos2015-06-113-0/+22
|/ / | | | | | | | | - Press m to toggle flow mark - Flow mark is set in libmproxy/console/common.py. Currently set to "==="
* | fix #615Maximilian Hils2015-06-082-0/+6
| |
* | fix #618Maximilian Hils2015-06-081-1/+1
| |
* | import travis config from netlibThomas Kriechbaumer2015-06-081-8/+49
| | | | | | | | this enables ALPN support with OpenSSL 1.0.2
* | Merge pull request #613 from dweinstein/patch/docker-tweaksDavid Weinstein2015-06-072-27/+1
|\ \ | | | | | | match name of automated build base img
| * | match name of automated build base imgDavid Weinstein2015-06-072-27/+1
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 14:49:40 +0000