| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Enable mouse interaction, add a hint for selecting text. | Aldo Cortesi | 2015-06-02 | 2 | -0/+11 | |
| | | | | | | | | | Fixes #597 | |||||
| * | | Merge pull request #605 from tekii/fix-604 | Maximilian Hils | 2015-06-01 | 1 | -2/+2 | |
| |\ \ | | | | | | | fixes #604 catch method not found for handling pyperclip not found | |||||
| | * | | fixes #604 catch method not found for handling pyperclip not found | Marcelo Glezer | 2015-06-01 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-06-01 | 8 | -12/+12 | |
| |\ \ | ||||||
| | * \ | Merge pull request #600 from elitest/print-bracket-fix | Maximilian Hils | 2015-05-31 | 8 | -12/+12 | |
| | |\ \ | | | | | | | | | Print consistency | |||||
| | | * | | reverting change in libmproxy/contrib/pyparsing.py | Jim Shaver | 2015-05-31 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | revert changes in ncontrib | Jim Shaver | 2015-05-31 | 2 | -21/+21 | |
| | | | | | ||||||
| | | * | | Merge remote-tracking branch 'upstream/master' into print-bracket-fix | Jim Shaver | 2015-05-31 | 200 | -10425/+74185 | |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py | |||||
| | | * | | Fixed print function to be inline with python 3 | Jim Shaver | 2015-05-29 | 10 | -37/+37 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-31 | 3 | -6/+6 | |
| |\| | | | ||||||
| | * | | | fix #599 | Maximilian Hils | 2015-05-31 | 1 | -5/+5 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-05-31 | 122 | -1006/+8494 | |
| | |\ \ \ | ||||||
| | * | | | | add bench tool for windows | Maximilian Hils | 2015-05-31 | 2 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Appease the code style gods. | Aldo Cortesi | 2015-05-31 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Remove dependency on PyOpenSSL, move version check into netlib. | Aldo Cortesi | 2015-05-31 | 2 | -45/+4 | |
| | |/ / / |/| | | | | | | | | | | | | | | | There are a few more functions in the code that accesses PyOpenSSL directly that should probably also be moved to netlib. Later. | |||||
| * | | | | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 102 | -856/+1641 | |
| | | | | | ||||||
| * | | | | Ensure that flow/view state is consistent. | Aldo Cortesi | 2015-05-29 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | Fixes #595 and #592 | |||||
| * | | | | Post-release version bump, and checklist addition. | Aldo Cortesi | 2015-05-26 | 2 | -1/+4 | |
| | | | | | ||||||
| * | | | | release: include resources PyInstaller doesn't record in spec files. | Aldo Cortesi | 2015-05-25 | 3 | -0/+12 | |
| | | | | | ||||||
| * | | | | docs: widen sidebar | Aldo Cortesi | 2015-05-25 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | docs: don't show un-necessary collapse target on mobile | Aldo Cortesi | 2015-05-24 | 2 | -13/+3 | |
| | | | | | ||||||
| * | | | | docs: styles now live in www.mitproxy.org repo, make images responsive | Aldo Cortesi | 2015-05-24 | 10 | -77/+83 | |
| | | | | | ||||||
| * | | | | docs: adjust for countershape changes | Aldo Cortesi | 2015-05-24 | 2 | -43/+52 | |
| | | | | | ||||||
| * | | | | Move websitelayout to website. | Aldo Cortesi | 2015-05-23 | 2 | -58/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-23 | 5 | -9/+6716 | |
| |\ \ \ \ | ||||||
| | * | | | | docs: bootstrap theme + logo | Aldo Cortesi | 2015-05-22 | 4 | -6/+6713 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #591 from Kriechi/autoenv-improvements | Maximilian Hils | 2015-05-21 | 1 | -3/+3 | |
| | |\ \ \ \ | | | | | | | | | | | | | improve autoenv script | |||||
| | | * | | | | improve autoenv script | Thomas Kriechbaumer | 2015-05-21 | 1 | -3/+3 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | * properly quote DIR variable (it might contain spaces) * use builtin string magic instead of `dirname` | |||||
| * / / / / | doc: fix nav in website mode | Aldo Cortesi | 2015-05-22 | 1 | -3/+3 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-20 | 1 | -1/+1 | |
| |\| | | | ||||||
| | * | | | Update CHANGELOG | Maximilian Hils | 2015-05-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | docs: first-pass conversion to bootstrap3 | Aldo Cortesi | 2015-05-20 | 6 | -55/+87 | |
| |/ / / | | | | | | | | | | Crappy default styling for now. | |||||
| * | | | certificate docs: reorg, wording, tweaks | Aldo Cortesi | 2015-05-18 | 11 | -67/+78 | |
| | | | | ||||||
| * | | | Merge branch 'ssldocs' of https://github.com/elitest/mitmproxy into ↵ | Aldo Cortesi | 2015-05-18 | 18 | -331/+125 | |
| |\ \ \ | | | | | | | | | | | | | elitest-ssldocs | |||||
| | * | | | Added on page documentation | Jim Shaver | 2015-04-11 | 1 | -14/+21 | |
| | | | | | ||||||
| | * | | | Minor reorg and add link for Chrome on Linux | Jim Shaver | 2015-04-10 | 1 | -2/+7 | |
| | | | | | ||||||
| | * | | | Cleaned up wrapping and added links to external CA instructions. | Jim Shaver | 2015-04-07 | 1 | -40/+36 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy into ssldocs | Jim Shaver | 2015-03-19 | 9 | -212/+314 | |
| | |\| | | ||||||
| | * | | | now actually tracking ssl.html | Jim Shaver | 2015-03-18 | 1 | -0/+113 | |
| | | | | | ||||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Jim Shaver | 2015-03-18 | 2 | -2/+2 | |
| | |\ \ \ | ||||||
| | * | | | | consolidated down all SSL documentation into one document | Jim Shaver | 2015-03-18 | 6 | -109/+3 | |
| | | | | | | ||||||
| | * | | | | Better english | Jim Shaver | 2015-03-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Removes all of the platform specific certificate installation instructions. | Jim Shaver | 2015-03-17 | 15 | -224/+3 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #584 from dlethin/feature/http_1_0 | Aldo Cortesi | 2015-05-18 | 1 | -1/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Make sure proxy returns the httpversion specified in the request | |||||
| | * | | | | | Make sure proxy returns the httpversion specified in the request rather | Doug Lethin | 2015-05-15 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | than hardcoding to 1.1. | |||||
| * | | | | | | Merge pull request #585 from TearsDontFalls/master | Aldo Cortesi | 2015-05-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | docs: Single Qoute for ignore pattern with "!" | |||||
| | * | | | | | | docs: Single Qoute for ignore pattern with "!" | TearsDontFalls | 2015-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | because wouldnt work with default bash settings as its part of history expansion in bash | |||||
| * | | | | | | | Release pep: bump version, changelog, contributors | Aldo Cortesi | 2015-05-18 | 3 | -33/+96 | |
| |/ / / / / / | ||||||
| * | | | | | | docs: add parantheses for ignore parameters. | Maximilian Hils | 2015-05-10 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #576 from nickraptis/req-ts-start | Maximilian Hils | 2015-05-08 | 1 | -0/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Accurately timestamp start of request | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |