Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Added functionality to write marked flows to file | Jake Drahos | 2015-06-11 | 2 | -0/+13 | |
| | | | | w (write) -> m (marked) | |||||
* | Unmark duplicated flows | Jake Drahos | 2015-06-11 | 1 | -1/+3 | |
| | | | | If a marked flow is duplicated, the duplicate will now be unmarked | |||||
* | Changed symbols and colors | Jake Drahos | 2015-06-11 | 2 | -2/+5 | |
| | | | | | Added a better symbol for the mark, and changed the color to red. This helps it stand out more easily. | |||||
* | Fixed console rendering bug | Jake Drahos | 2015-06-11 | 1 | -2/+5 | |
| | | | | Clearing all flows now works properly | |||||
* | Marked flows not deleted on clear all | Jake Drahos | 2015-06-11 | 2 | -4/+11 | |
| | | | | | | Marked flows survive a clear all unless all current flows are marked. Bug: They don't show up until another flow is added | |||||
* | Implemented basic marking of flows | Jake Drahos | 2015-06-11 | 3 | -0/+22 | |
| | | | | | - Press m to toggle flow mark - Flow mark is set in libmproxy/console/common.py. Currently set to "===" | |||||
* | fix #615 | Maximilian Hils | 2015-06-08 | 1 | -0/+1 | |
| | ||||||
* | fix #618 | Maximilian Hils | 2015-06-08 | 1 | -1/+1 | |
| | ||||||
* | 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 | 5 | -4549/+5 | |
|\ | | | | | replace contrib libraries with pypi dependencies | |||||
| * | replace contrib libraries with pypi dependencies | Thomas Kriechbaumer | 2015-06-02 | 5 | -4549/+5 | |
| | | ||||||
* | | Bump version | Aldo Cortesi | 2015-06-04 | 1 | -1/+1 | |
|/ | ||||||
* | console: click-enable tabs | Aldo Cortesi | 2015-06-02 | 1 | -11/+40 | |
| | ||||||
* | console: convert add_event to a signal. | Aldo Cortesi | 2015-06-02 | 6 | -24/+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 | |
| | | | | Fixes #597 | |||||
* | 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 | 3 | -4/+4 | |
|\ | ||||||
| * | 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 | 50 | -8193/+12547 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py | |||||
| * | | Fixed print function to be inline with python 3 | Jim Shaver | 2015-05-29 | 5 | -28/+28 | |
| | | | ||||||
* | | | 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 | 1 | -44/+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 Cortesi | 2015-05-30 | 40 | -404/+732 | |
| | | ||||||
* | | 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 | 1 | -1/+1 | |
| | | ||||||
* | | 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. | |||||
* | | | Release pep: bump version, changelog, contributors | Aldo Cortesi | 2015-05-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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-02 | 3 | -1423/+1718 | |
|\ \ \ | ||||||
| * | | | web: try harder to fix editor | Maximilian Hils | 2015-05-01 | 1 | -2/+7 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-05-01 | 6 | -21/+11 | |
| |\| | | ||||||
| * | | | mitmweb: add editor | Maximilian Hils | 2015-05-01 | 3 | -1423/+1713 | |
| | | | | ||||||
* | | | | Adapt to new Pathoc API - silence output to stdout. | Aldo Cortesi | 2015-05-02 | 1 | -2/+1 | |
| |/ / |/| | | ||||||
* | | | pretty_size now lives in netlib.utils | Aldo Cortesi | 2015-04-30 | 6 | -21/+11 | |
|/ / | ||||||
* | | 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) | |||||
* | | | make code more pythonic | Maximilian Hils | 2015-04-26 | 1 | -8/+11 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'tunz/crash1' | Maximilian Hils | 2015-04-26 | 1 | -4/+11 | |
|\ \ \ | ||||||
| * | | | Fix crash when save to clipboard before loading | Choongwoo Han | 2015-04-23 | 1 | -4/+11 | |
| | | | | ||||||
* | | | | remove superfluous set_focus | Maximilian Hils | 2015-04-26 | 1 | -2/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-04-26 | 2 | -110/+85 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Check overwrite, when save to file instaed of clipboard | Choongwoo Han | 2015-04-23 | 1 | -2/+20 | |
| |/ / | ||||||
| * | | Missed some un-needed variable declarations | Aldo Cortesi | 2015-04-21 | 1 | -3/+1 | |
| | | | ||||||
| * | | HTTP request reading moves to netlib | Aldo Cortesi | 2015-04-21 | 1 | -105/+64 | |
| | | |