| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | import travis config from netlib | Thomas Kriechbaumer | 2015-06-08 | 1 | -8/+49 | |
| * | | Merge pull request #613 from dweinstein/patch/docker-tweaks | David Weinstein | 2015-06-07 | 2 | -27/+1 | |
| |\ \ | ||||||
| | * | | match name of automated build base img | David Weinstein | 2015-06-07 | 2 | -27/+1 | |
| |/ / | ||||||
| * | | Merge pull request #611 from dweinstein/feature/dockerfiles | Aldo Cortesi | 2015-06-07 | 3 | -0/+31 | |
| |\ \ | ||||||
| | * | | initial add of docker mitmproxy | David Weinstein | 2015-06-06 | 3 | -0/+31 | |
| |/ / | ||||||
| * | | Merge pull request #610 from tekii/fix-607 | Aldo Cortesi | 2015-06-06 | 1 | -1/+9 | |
| |\ \ | ||||||
| | * | | fix #607 fix message | Marcelo Glezer | 2015-06-05 | 1 | -1/+2 | |
| | * | | fix #607 decode data before sending it to pyperclip | Marcelo Glezer | 2015-06-05 | 1 | -1/+8 | |
| |/ / | ||||||
| * | | Merge pull request #603 from Kriechi/remove-contrib | Aldo Cortesi | 2015-06-04 | 6 | -4550/+8 | |
| |\ \ | ||||||
| | * | | replace contrib libraries with pypi dependencies | Thomas Kriechbaumer | 2015-06-02 | 6 | -4550/+8 | |
| * | | | Bump version | Aldo Cortesi | 2015-06-04 | 1 | -1/+1 | |
| * | | | Changelog for v0.12.1 | Aldo Cortesi | 2015-06-03 | 2 | -2/+14 | |
| |/ / | ||||||
| * | | console: click-enable tabs | Aldo Cortesi | 2015-06-02 | 1 | -11/+40 | |
| * | | console: convert add_event to a signal. | Aldo Cortesi | 2015-06-02 | 7 | -30/+36 | |
| * | | Minor typo in script error. | Aldo Cortesi | 2015-06-02 | 1 | -1/+1 | |
| * | | console: click in flow list to view flow | Aldo Cortesi | 2015-06-02 | 1 | -0/+6 | |
| * | | console: mouse scrollwheel throughout. | Aldo Cortesi | 2015-06-02 | 1 | -6/+13 | |
| * | | Enable mouse interaction, add a hint for selecting text. | Aldo Cortesi | 2015-06-02 | 2 | -0/+11 | |
| * | | 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 | 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 | |
| | |\ \ | ||||||
| | | * | | 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 | |
| | | |\ \ | | |/ / | |/| | | ||||||
| | | * | | 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 | |
| | |/ / / |/| | | | ||||||
| * | | | | 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 | |
| * | | | | 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 | Thomas Kriechbaumer | 2015-05-21 | 1 | -3/+3 | |
| | |/ / / / | ||||||
| * / / / / | 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 | |
| |/ / / | ||||||
| * | | | certificate docs: reorg, wording, tweaks | Aldo Cortesi | 2015-05-18 | 11 | -67/+78 | |
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |