| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | | | | Accurately timestamp start of request | Nick Raptis | 2015-05-08 | 1 | -0/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a request from a stream, try to get an accurate start timestamp from the Reader. This was already in the code and also used when building response objects, but was ommited in commit ddf458b330bf9fe200cb1dbc3ddb5ae1a5d2102a Without his logic and when the client is reusing a connection to send requests, the timestamp_start of subsequent requests is early and equal to when the connection started read blocking | ||||
| * | | | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-03 | 1 | -25/+71 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-05-02 | 3 | -10/+19 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | check in last attempt at contenteditable before retreating to inputs | Maximilian Hils | 2015-05-02 | 1 | -25/+71 |
| | | | | | | | | |||||
| * | | | | | | | Adapt to new literal escaping style in pathod | Aldo Cortesi | 2015-05-03 | 1 | -3/+1 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-02 | 8 | -1578/+1962 |
| |\| | | | | | |||||
| | * | | | | | web: try harder to fix editor | Maximilian Hils | 2015-05-01 | 2 | -4/+14 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-05-01 | 7 | -31/+16 |
| | |\| | | | | |||||
| | * | | | | | mitmweb: add editor | Maximilian Hils | 2015-05-01 | 8 | -1578/+1952 |
| | | | | | | | |||||
| * | | | | | | Adapt to new Pathoc API - silence output to stdout. | Aldo Cortesi | 2015-05-02 | 3 | -10/+19 |
| | |/ / / / |/| | | | | |||||
| * | | | | | pretty_size now lives in netlib.utils | Aldo Cortesi | 2015-04-30 | 7 | -31/+16 |
| |/ / / / | |||||
| * | | | | Merge pull request #569 from mike-pt/master | Maximilian Hils | 2015-04-27 | 2 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | Match all freebsd versions and not just freebsd10 | ||||
| | * | | | | + Use sys.platform.startswith("freebsd") instead of matching just freebsd10. | Mike C | 2015-04-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | + This means support for any freebsd version (note that I only tested 11-CURRENT and 9) | ||||
| * | | | | | improve docs for win install | Maximilian Hils | 2015-04-26 | 1 | -12/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding Python to PATH during installation is useful, but doesn't help users who have already installed Python. The Powershell command takes care of the Scripts directory as well. | ||||
| * | | | | | Merge pull request #555 from elitest/userinstalldocs | Maximilian Hils | 2015-04-26 | 2 | -32/+46 |
| |\ \ \ \ \ | | | | | | | | | | | | | User Installation Documentation update | ||||
| | * | | | | | Re-org and added platform specific install from source docs, refs: ↵ | Jim Shaver | 2015-04-25 | 1 | -30/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | mitmproxy/mitmproxy#398 | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |