aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #611 from dweinstein/feature/dockerfilesAldo Cortesi2015-06-073-0/+31
|\ | | | | initial add of docker mitmproxy
| * initial add of docker mitmproxyDavid Weinstein2015-06-063-0/+31
|/
* Merge pull request #610 from tekii/fix-607Aldo Cortesi2015-06-061-1/+9
|\ | | | | Fix 607
| * fix #607 fix messageMarcelo Glezer2015-06-051-1/+2
| |
| * fix #607 decode data before sending it to pyperclipMarcelo Glezer2015-06-051-1/+8
|/
* Merge pull request #603 from Kriechi/remove-contribAldo Cortesi2015-06-046-4550/+8
|\ | | | | replace contrib libraries with pypi dependencies
| * replace contrib libraries with pypi dependenciesThomas Kriechbaumer2015-06-026-4550/+8
| |
* | Bump versionAldo Cortesi2015-06-041-1/+1
| |
* | Changelog for v0.12.1Aldo Cortesi2015-06-032-2/+14
|/
* console: click-enable tabsAldo Cortesi2015-06-021-11/+40
|
* console: convert add_event to a signal.Aldo Cortesi2015-06-027-30/+36
|
* Minor typo in script error.Aldo Cortesi2015-06-021-1/+1
|
* console: click in flow list to view flowAldo Cortesi2015-06-021-0/+6
|
* console: mouse scrollwheel throughout.Aldo Cortesi2015-06-021-6/+13
|
* Enable mouse interaction, add a hint for selecting text.Aldo Cortesi2015-06-022-0/+11
| | | | Fixes #597
* Merge pull request #605 from tekii/fix-604Maximilian Hils2015-06-011-2/+2
|\ | | | | fixes #604 catch method not found for handling pyperclip not found
| * fixes #604 catch method not found for handling pyperclip not foundMarcelo Glezer2015-06-011-2/+2
|/
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-06-018-12/+12
|\
| * Merge pull request #600 from elitest/print-bracket-fixMaximilian Hils2015-05-318-12/+12
| |\ | | | | | | Print consistency
| | * reverting change in libmproxy/contrib/pyparsing.pyJim Shaver2015-05-311-1/+1
| | |
| | * revert changes in ncontribJim Shaver2015-05-312-21/+21
| | |
| | * Merge remote-tracking branch 'upstream/master' into print-bracket-fixJim Shaver2015-05-31200-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 3Jim Shaver2015-05-2910-37/+37
| | |
* | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-313-6/+6
|\| |
| * | fix #599Maximilian Hils2015-05-311-5/+5
| | |
| * | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-31122-1006/+8494
| |\ \
| * | | add bench tool for windowsMaximilian Hils2015-05-312-1/+1
| | | |
* | | | Appease the code style gods.Aldo Cortesi2015-05-311-1/+2
| | | |
* | | | Remove dependency on PyOpenSSL, move version check into netlib.Aldo Cortesi2015-05-312-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 Cortesi2015-05-30102-856/+1641
| | |
* | | Ensure that flow/view state is consistent.Aldo Cortesi2015-05-291-2/+3
| | | | | | | | | | | | Fixes #595 and #592
* | | Post-release version bump, and checklist addition.Aldo Cortesi2015-05-262-1/+4
| | |
* | | release: include resources PyInstaller doesn't record in spec files.Aldo Cortesi2015-05-253-0/+12
| | |
* | | docs: widen sidebarAldo Cortesi2015-05-251-3/+3
| | |
* | | docs: don't show un-necessary collapse target on mobileAldo Cortesi2015-05-242-13/+3
| | |
* | | docs: styles now live in www.mitproxy.org repo, make images responsiveAldo Cortesi2015-05-2410-77/+83
| | |
* | | docs: adjust for countershape changesAldo Cortesi2015-05-242-43/+52
| | |
* | | Move websitelayout to website.Aldo Cortesi2015-05-232-58/+1
| | |
* | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-235-9/+6716
|\ \ \
| * | | docs: bootstrap theme + logoAldo Cortesi2015-05-224-6/+6713
| | | |
| * | | Merge pull request #591 from Kriechi/autoenv-improvementsMaximilian Hils2015-05-211-3/+3
| |\ \ \ | | | | | | | | | | improve autoenv script
| | * | | improve autoenv scriptThomas Kriechbaumer2015-05-211-3/+3
| |/ / / | | | | | | | | | | | | | | | | * properly quote DIR variable (it might contain spaces) * use builtin string magic instead of `dirname`
* / / / doc: fix nav in website modeAldo Cortesi2015-05-221-3/+3
|/ / /
* | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-201-1/+1
|\| |
| * | Update CHANGELOGMaximilian Hils2015-05-181-1/+1
| | |
* | | docs: first-pass conversion to bootstrap3Aldo Cortesi2015-05-206-55/+87
|/ / | | | | | | Crappy default styling for now.
* | certificate docs: reorg, wording, tweaksAldo Cortesi2015-05-1811-67/+78
| |
* | Merge branch 'ssldocs' of https://github.com/elitest/mitmproxy into ↵Aldo Cortesi2015-05-1818-331/+125
|\ \ | | | | | | | | | elitest-ssldocs
| * | Added on page documentationJim Shaver2015-04-111-14/+21
| | |
| * | Minor reorg and add link for Chrome on LinuxJim Shaver2015-04-101-2/+7
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 19:31:37 +0000