| Commit message (Expand) | Author | Age | Files | Lines |
* | fix all tests except those using set_url and get_url | Maximilian Hils | 2014-02-05 | 5 | -78/+51 |
* | push failing tests down to 43 | Maximilian Hils | 2014-02-04 | 4 | -93/+63 |
* | bring failing tests back into the double-digit range | Maximilian Hils | 2014-01-31 | 4 | -116/+131 |
* | remove _flow_map from state, improve logging | Maximilian Hils | 2014-01-31 | 2 | -5/+1 |
* | fix most testsuite errors, improve proxy error handling | Maximilian Hils | 2014-01-29 | 5 | -31/+29 |
* | merge master | Maximilian Hils | 2014-01-28 | 1 | -0/+5 |
|\ |
|
| * | move test requirements out of main requirements.txt | Maximilian Hils | 2014-01-28 | 1 | -0/+5 |
* | | unify ipv4/ipv6 address handling | Maximilian Hils | 2014-01-28 | 1 | -2/+2 |
|/ |
|
* | Deprecate Flow.unload_script in favor of Flow.unload_scripts | Aldo Cortesi | 2014-01-13 | 1 | -4/+7 |
* | Extract command parsing and use in script grid editor | Aldo Cortesi | 2014-01-13 | 1 | -1/+1 |
* | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 4 | -36/+31 |
* | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 1 | -10/+5 |
* | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 1 | -43/+37 |
* | ignore console test utilities on windows | Maximilian Hils | 2014-01-10 | 1 | -2/+3 |
* | Merge pull request #192 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 1 | -4/+4 |
|\ |
|
| * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 1 | -4/+4 |
* | | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 2 | -4/+121 |
|\ \ |
|
| * | | now really fix it + test | Pedro Worcel | 2013-12-26 | 1 | -1/+20 |
| * | | add looping around | Pedro Worcel | 2013-12-26 | 1 | -0/+21 |
| * | | fix failing test | Pedro Worcel | 2013-12-25 | 1 | -1/+2 |
| * | | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 2 | -12/+64 |
| * | | test passing, UI still not working | root | 2013-12-24 | 2 | -0/+24 |
* | | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 2 | -0/+26 |
|\ \ \ |
|
| * | | | Add CSS view which beautifies CSS files if cssutils library is available, | Tomaz Muraus | 2014-01-04 | 2 | -0/+26 |
| |/ / |
|
* | | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 |
* | | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 4 | -23/+24 |
|/ / |
|
* | | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 5 | -17/+30 |
|\ \
| |/
|/| |
|
* | | fix script path error in tests | Maximilian Hils | 2013-12-15 | 2 | -2/+14 |
* | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 3 | -8/+88 |
|/ |
|
* | add content-length 0 if we remove header for chunked encoding, fixes #186 | Maximilian Hils | 2013-12-12 | 1 | -1/+12 |
* | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 2 | -0/+27 |
* | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 1 | -0/+5 |
* | backport changes to fix tests | Maximilian Hils | 2013-12-08 | 2 | -3/+3 |
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -10/+0 |
|\ |
|
| * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 5 | -16/+49 |
| |\ |
|
| * | | Remove obsolete test. | Aldo Cortesi | 2013-12-08 | 1 | -10/+0 |
* | | | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 1 | -4/+2 |
|\ \ \ |
|
| * | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -4/+2 |
* | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Fix pretty_size unit tests. | Aldo Cortesi | 2013-08-23 | 1 | -1/+1 |
* | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 4 | -8/+14 |
|\| | |
|
| * | | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 1 | -3/+0 |
| * | | Make use of a change to netlib.tcp that clarifies error conditions for flush ... | Aldo Cortesi | 2013-07-30 | 1 | -1/+1 |
| * | | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 1 | -1/+1 |
| * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 2 | -3/+12 |
* | | | fix request_timestamps test case | Maximilian Hils | 2013-06-18 | 1 | -1/+2 |
* | | | skip tests on windows that don't make sense | Maximilian Hils | 2013-06-18 | 2 | -1/+10 |
* | | | update tests to reflect changes to options.scripts | Maximilian Hils | 2013-06-17 | 6 | -11/+31 |
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 5 | -16/+49 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | update test script | Maximilian Hils | 2013-06-16 | 1 | -3/+3 |