aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update README.mkdMaximilian Hils2015-06-181-1/+0
* add landscape/prospector configThomas Kriechbaumer2015-06-183-21/+15
* Update README.mkdMaximilian Hils2015-06-161-4/+6
* fix pep8 configThomas Kriechbaumer2015-06-151-1/+0
* Handle invalid IDNA encoding in hostnamesAldo Cortesi2015-06-122-6/+12
* Fix typo in docs - thanks to Jim_Showalter@intuit.comAldo Cortesi2015-06-121-2/+2
* Merge pull request #624 from drahosj/masterAldo Cortesi2015-06-124-5/+63
|\
| * Added unmark all functionalityJake Drahos2015-06-111-0/+5
| * Moved marking from flow to consoleJake Drahos2015-06-115-26/+29
| * Merge remote-tracking branch 'origin/master'Jake Drahos2015-06-110-0/+0
| |\
| | * Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| * | Changed mark symbolJake Drahos2015-06-111-2/+2
| * | Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| |/
| * Unmark duplicated flowsJake Drahos2015-06-111-1/+3
| * Changed symbols and colorsJake Drahos2015-06-112-2/+5
| * Fixed console rendering bugJake Drahos2015-06-111-2/+5
| * Marked flows not deleted on clear allJake Drahos2015-06-112-4/+11
| * Implemented basic marking of flowsJake Drahos2015-06-113-0/+22
|/
* fix #615Maximilian Hils2015-06-082-0/+6
* fix #618Maximilian Hils2015-06-081-1/+1
* import travis config from netlibThomas Kriechbaumer2015-06-081-8/+49
* Merge pull request #613 from dweinstein/patch/docker-tweaksDavid Weinstein2015-06-072-27/+1
|\
| * match name of automated build base imgDavid Weinstein2015-06-072-27/+1
|/
* Merge pull request #611 from dweinstein/feature/dockerfilesAldo Cortesi2015-06-073-0/+31
|\
| * 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 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 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
* Merge pull request #605 from tekii/fix-604Maximilian Hils2015-06-011-2/+2
|\
| * 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
| |\
| | * 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
| | |\ | | |/ | |/|
| | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 02:12:53 +0000