aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* 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-081-0/+1
* fix #618Maximilian Hils2015-06-081-1/+1
* 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-045-4549/+5
|\
| * replace contrib libraries with pypi dependenciesThomas Kriechbaumer2015-06-025-4549/+5
* | Bump versionAldo Cortesi2015-06-041-1/+1
|/
* console: click-enable tabsAldo Cortesi2015-06-021-11/+40
* console: convert add_event to a signal.Aldo Cortesi2015-06-026-24/+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 #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-013-4/+4
|\
| * 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-3150-8193/+12547
| |\
| * | Fixed print function to be inline with python 3Jim Shaver2015-05-295-28/+28
* | | Appease the code style gods.Aldo Cortesi2015-05-311-1/+2
* | | Remove dependency on PyOpenSSL, move version check into netlib.Aldo Cortesi2015-05-311-44/+4
| |/ |/|
* | Add coding style check, reformat.Aldo Cortesi2015-05-3040-404/+732
* | Ensure that flow/view state is consistent.Aldo Cortesi2015-05-291-2/+3
* | Post-release version bump, and checklist addition.Aldo Cortesi2015-05-261-1/+1
* | Merge pull request #584 from dlethin/feature/http_1_0Aldo Cortesi2015-05-181-1/+2
|\ \
| * | Make sure proxy returns the httpversion specified in the request ratherDoug Lethin2015-05-151-1/+2
* | | Release pep: bump version, changelog, contributorsAldo Cortesi2015-05-181-1/+1
* | | Accurately timestamp start of requestNick Raptis2015-05-081-0/+5
* | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-023-1423/+1718
|\ \ \
| * | | web: try harder to fix editorMaximilian Hils2015-05-011-2/+7
| * | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-016-21/+11
| |\| |
| * | | mitmweb: add editorMaximilian Hils2015-05-013-1423/+1713
* | | | Adapt to new Pathoc API - silence output to stdout.Aldo Cortesi2015-05-021-2/+1
| |/ / |/| |
* | | pretty_size now lives in netlib.utilsAldo Cortesi2015-04-306-21/+11
|/ /
* | Merge pull request #569 from mike-pt/masterMaximilian Hils2015-04-272-4/+4
|\ \
| * | + Use sys.platform.startswith("freebsd") instead of matching just freebsd10.Mike C2015-04-272-4/+4
* | | make code more pythonicMaximilian Hils2015-04-261-8/+11
* | | Merge remote-tracking branch 'tunz/crash1'Maximilian Hils2015-04-261-4/+11
|\ \ \
| * | | Fix crash when save to clipboard before loadingChoongwoo Han2015-04-231-4/+11
* | | | remove superfluous set_focusMaximilian Hils2015-04-261-2/+0
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-262-110/+85
|\ \ \ \ | | |/ / | |/| |
| * | | Check overwrite, when save to file instaed of clipboardChoongwoo Han2015-04-231-2/+20
| |/ /
| * | Missed some un-needed variable declarationsAldo Cortesi2015-04-211-3/+1