Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | improve .replace() and move it into netlib | Maximilian Hils | 2016-04-02 | 10 | -65/+100 |
| | |||||
* | add Serializeable.copy | Maximilian Hils | 2016-04-02 | 7 | -19/+34 |
| | |||||
* | travis: checkout full repo for builds | Maximilian Hils | 2016-03-31 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-03-31 | 29 | -90/+377 |
|\ | |||||
| * | Merge pull request #1050 from zlorb/master | Maximilian Hils | 2016-03-29 | 5 | -2/+281 |
| |\ | | | | | | | Flow export to locust.io load test tool [http://locust.io] | ||||
| | * | Merge remote-tracking branch 'mitmproxy/master' | Zohar Lorberbaum | 2016-03-28 | 0 | -0/+0 |
| | |\ | | |/ | |/| | | | | | | | # Conflicts: # test/mitmproxy/test_flow_export.py | ||||
| * | | add safeguard | Thomas Kriechbaumer | 2016-03-27 | 1 | -1/+2 |
| | | | |||||
| * | | improve flow export tests | Thomas Kriechbaumer | 2016-03-27 | 1 | -2/+23 |
| | | | |||||
| * | | s/nocover/no cover/g | Thomas Kriechbaumer | 2016-03-27 | 12 | -33/+32 |
| | | | | | | | | | according to coveralls docs | ||||
| * | | increase test timeout | Thomas Kriechbaumer | 2016-03-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1055 from MatthewShao/issue#963 | Thomas Kriechbaumer | 2016-03-27 | 15 | -51/+38 |
| |\ \ | | | | | | | | | Simplify '.content' by removing CONTENT_MISSING | ||||
| | * | | minor fix about if-else statement | Matthew Shao | 2016-03-27 | 1 | -3/+1 |
| | | | | |||||
| | * | | update comments | Matthew Shao | 2016-03-26 | 3 | -7/+7 |
| | | | | |||||
| | * | | update document for the removal of CONTENT_MISSING | Matthew Shao | 2016-03-26 | 1 | -2/+1 |
| | | | | |||||
| | * | | replace CONTENT_MISSING with None. | Matthew Shao | 2016-03-26 | 14 | -47/+37 |
| | | | | |||||
| | * | | Setting CONTENT_MISSING to None | Matthew Shao | 2016-03-26 | 1 | -1/+1 |
| |/ / | |||||
| | * | merge | Zohar Lorberbaum | 2016-03-28 | 1 | -1/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'mitmproxy/master' | Zohar Lorberbaum | 2016-03-28 | 1 | -1/+0 |
| | | | | | | | | | | | | Merge with master | ||||
| | * | Merge with master | Zohar Lorberbaum | 2016-03-28 | 27 | -86/+96 |
| | | | |||||
| | * | cleaner target url | Zohar Lorberbaum | 2016-03-28 | 2 | -6/+7 |
| | | | |||||
| | * | locust_task re-use locust_code. | Zohar Lorberbaum | 2016-03-27 | 2 | -69/+25 |
| | | | |||||
| | * | pep8 | Zohar Lorberbaum | 2016-03-25 | 2 | -20/+20 |
| | | | |||||
| | * | Add UI shortcuts. | Zohar Lorberbaum | 2016-03-24 | 5 | -0/+18 |
| | | | |||||
| | * | Flow export to locust.io load test tool. | Zohar Lorberbaum | 2016-03-23 | 2 | -4/+308 |
| |/ | |||||
* / | snapshots: fix build tag | Maximilian Hils | 2016-03-31 | 1 | -1/+2 |
|/ | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 4 | -22/+30 |
| | |||||
* | netlib: request.path can be None | Maximilian Hils | 2016-03-20 | 2 | -2/+10 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 6 | -26/+44 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 3 | -52/+22 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 9 | -38/+37 |
| | |||||
* | Merge pull request #1047 from mitmproxy/no-coverage-by-default | Thomas Kriechbaumer | 2016-03-20 | 3 | -3/+3 |
|\ | | | | | py.test: disable coverage collection by default | ||||
| * | py.test: disable coverage collection by default | Maximilian Hils | 2016-03-20 | 3 | -3/+3 |
| | | |||||
* | | py3++: iteritems | Maximilian Hils | 2016-03-20 | 6 | -20/+28 |
| | | |||||
* | | py3++: cStringIO | Maximilian Hils | 2016-03-20 | 15 | -66/+59 |
|/ | |||||
* | Merge pull request #1045 from mitmproxy/py3-scripts | Maximilian Hils | 2016-03-20 | 11 | -26/+41 |
|\ | | | | | Port mitmproxy.script to Python 3 | ||||
| * | fix script exception display | Maximilian Hils | 2016-03-19 | 1 | -2/+4 |
| | | |||||
| * | port mitmproxy.scripts to py3 | Maximilian Hils | 2016-03-19 | 10 | -24/+37 |
| | | |||||
* | | Merge pull request #1043 from mitmproxy/better-scripts | Thomas Kriechbaumer | 2016-03-19 | 12 | -161/+186 |
|\| | | | | | Better scripts | ||||
| * | fix tests on OSX | Maximilian Hils | 2016-03-19 | 1 | -5/+10 |
| | | |||||
| * | simplify tests for @concurrent | Maximilian Hils | 2016-03-19 | 3 | -89/+33 |
| | | |||||
| * | add tests for mitmproxy.script.reloader | Maximilian Hils | 2016-03-19 | 2 | -3/+32 |
| | | |||||
| * | improve mitmproxy.scripts semantics, clean up tests | Maximilian Hils | 2016-03-19 | 8 | -72/+119 |
| | | |||||
* | | fix pyOpenSSL version | Maximilian Hils | 2016-03-19 | 1 | -1/+1 |
| | | |||||
* | | update pyOpenSSL | Maximilian Hils | 2016-03-19 | 1 | -2/+2 |
|/ | |||||
* | restrict cryptography version for pyopenssl compat | Maximilian Hils | 2016-03-19 | 1 | -1/+1 |
| | |||||
* | fix dependency versions | Maximilian Hils | 2016-03-18 | 1 | -4/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/requires-io-master' | Maximilian Hils | 2016-03-18 | 1 | -4/+4 |
|\ | |||||
| * | [requires.io] dependency update | requires.io | 2016-03-18 | 1 | -4/+4 |
| | | |||||
* | | remove code duplication | Maximilian Hils | 2016-03-18 | 1 | -9/+6 |
|/ | |||||
* | Merge pull request #1040 from felixonmars/patch-1 | Thomas Kriechbaumer | 2016-03-18 | 1 | -1/+1 |
|\ | | | | | Allow lxml 3.6 |