aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #699 from onlywade/bugfix/docs_update_shortcut_keysMaximilian Hils2015-07-307-21/+24
|\ | | | | Update docs to reflect current shortcut keys for features which have …
| * Update docs to reflect current shortcut keys for features which have been ↵Wade Catron2015-07-297-21/+24
|/ | | | moved into the options menu.
* Merge pull request #548 from macmantrl/no_serverconnMaximilian Hils2015-07-264-4/+21
|\ | | | | Prevent unnecessary upstream server connects
| * Prevent unecessary upstream server connectsTerry Long2015-07-034-4/+21
| | | | | | | | | | | | Selectively connect to upstream server based on no_upstream_cert option. When no_upstream_cert is used during server replay, prevent connecting to the upstream server unless absolutely necessary.
* | Bump version for devAldo Cortesi2015-07-261-1/+1
| |
* | Changelog for v0.13Aldo Cortesi2015-07-261-0/+30
| |
* | fix module importsThomas Kriechbaumer2015-07-251-8/+8
| |
* | remove debug output in testsThomas Kriechbaumer2015-07-241-3/+0
| |
* | Merge pull request #675 from Kriechi/protocol-refactorMaximilian Hils2015-07-247-75/+101
|\ \ | | | | | | HTTP protocol refactoring
| * | refactor to use netlib.http protocolsThomas Kriechbaumer2015-07-225-27/+49
| | |
| * | use new netlib module namesThomas Kriechbaumer2015-07-226-47/+57
| | |
| * | use netlib.http_semantics for generic dataThomas Kriechbaumer2015-07-222-16/+10
| | |
* | | fix testsMaximilian Hils2015-07-241-1/+3
| | |
* | | improve inline scripts, fix #683, fix #684Maximilian Hils2015-07-247-153/+170
| | |
* | | minor style improvementsMaximilian Hils2015-07-221-6/+6
|/ /
* | update build scriptMaximilian Hils2015-07-221-69/+97
| |
* | make build script amazingMaximilian Hils2015-07-225-98/+170
| |
* | make build script executable on *nixMaximilian Hils2015-07-221-0/+0
| |
* | fix text selection hintMaximilian Hils2015-07-221-1/+1
| |
* | bump versionMaximilian Hils2015-07-222-29/+40
| |
* | preliminary release scriptMaximilian Hils2015-07-212-54/+87
| |
* | streamline build processMaximilian Hils2015-07-214-8/+134
| |
* | fix slack badgeMaximilian Hils2015-07-171-1/+1
| |
* | Add Slack to README.Maximilian Hils2015-07-151-3/+6
| |
* | Merge pull request #677 from isra17/json_errorMaximilian Hils2015-07-141-1/+2
|\ \ | | | | | | Use `ensure_ascii` in wep.app#broadcast
| * | Use `ensure_ascii` in wep.app#broadcastisra172015-07-131-1/+2
| | | | | | | | | | | | Otherwise, a non-unicode character in a flow cause mitmweb to crash.
* | | Merge pull request #676 from isra17/masterMaximilian Hils2015-07-142-3/+35
|\ \ \ | |/ / |/| | Add source address filter
| * | Add ~src ~dst REGEX filtersisra172015-07-132-3/+35
|/ / | | | | | | | | | | | | | | | | This filter allow to match on the request source and destination address in the form of `<IP>:<Port>`. Also fixed the parsing grammar to add a `WordEnd` after each filter name. That way, `~src` doesn't match `~s` instead and keep the behavior consistent with `~hq` != `~h`.
* | Merge pull request #673 from jlhonora/masterMaximilian Hils2015-07-084-11/+11
|\ \ | | | | | | Match g/G shortcuts to less
| * | Match g/G shortcuts to less, fix #631jlhonora2015-07-084-11/+11
|/ /
* | 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
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 13:47:41 +0000