Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1416 from mhils/issue-1396 | Maximilian Hils | 2016-07-23 | 3 | -4/+8 | |
|\ \ \ | | | | | | | | | fix #1396, fix #1205, fix #1374 | |||||
| * | | | fix #1396, fix #1205, fix #1374 | Maximilian Hils | 2016-07-23 | 3 | -4/+8 | |
| | | | | ||||||
* | | | | make the linter happy | Maximilian Hils | 2016-07-23 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | add remote debug example | Maximilian Hils | 2016-07-23 | 1 | -0/+19 | |
| | | | | ||||||
* | | | | Merge pull request #1402 from mhils/console-fixes | Maximilian Hils | 2016-07-23 | 4 | -23/+27 | |
|\ \ \ \ | |/ / / |/| | | | minor fixes | |||||
| * | | | fix test_view_urlencoded | Maximilian Hils | 2016-07-23 | 3 | -5/+10 | |
| | | | | ||||||
| * | | | minor fixes | Maximilian Hils | 2016-07-21 | 2 | -19/+18 | |
| | | | | ||||||
* | | | | improve dumper addon text alignment (#1415) | Maximilian Hils | 2016-07-23 | 4 | -37/+54 | |
| | | | | ||||||
* | | | | http2: fix kill (#1413) | Thomas Kriechbaumer | 2016-07-23 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | http2: cleanup tests | Thomas Kriechbaumer | 2016-07-23 | 1 | -37/+38 | |
| |/ / |/| | | ||||||
* | | | re-enable OSX builds on travis (#1411) | Maximilian Hils | 2016-07-22 | 1 | -4/+4 | |
| | | | ||||||
* | | | Merge pull request #1412 from cortesi/updated | Aldo Cortesi | 2016-07-23 | 32 | -134/+154 | |
|\ \ \ | | | | | | | | | Addon iface: .configure(options) -> .configure(options, updated) | |||||
| * | | | Addon iface: .configure(options) -> .configure(options, updated) | Aldo Cortesi | 2016-07-23 | 32 | -134/+154 | |
|/ / / | ||||||
* | | | Merge pull request #1410 from cortesi/addons | Aldo Cortesi | 2016-07-23 | 7 | -70/+136 | |
|\ \ \ | | | | | | | | | Keep maturing scripts and addons | |||||
| * | | | scripts: refactor some examples that keep global state | Aldo Cortesi | 2016-07-23 | 3 | -39/+43 | |
| | | | | | | | | | | | | | | | | We now have a better way to do this. | |||||
| * | | | script: convert test recorder to an addon class | Aldo Cortesi | 2016-07-23 | 2 | -19/+19 | |
| | | | | ||||||
| * | | | scripts: .start can now return an Addon instance | Aldo Cortesi | 2016-07-23 | 3 | -2/+39 | |
| | | | | ||||||
| * | | | script: tune auto reload | Aldo Cortesi | 2016-07-23 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't respond to directory changes - Ignore hidden files I've "solved" this as well as it can be done in modd, and getting good results here just turns into a large pile of heuristics that don't work in all circumstances. Also watchdog sucks. | |||||
| * | | | script: add a namespace adaptor to match Addons | Aldo Cortesi | 2016-07-23 | 2 | -11/+26 | |
|/ / / | ||||||
* / / | fix mitmproxy 0.11 dumpfile - was 0.18 before | Maximilian Hils | 2016-07-22 | 1 | -0/+0 | |
|/ / | ||||||
* | | Merge pull request #1399 from mhils/fix-cv-cache-invalidation | Maximilian Hils | 2016-07-21 | 5 | -18/+26 | |
|\ \ | | | | | | | Fix content view cache invalidation | |||||
| * | | fix content view cache invalidation | Maximilian Hils | 2016-07-21 | 5 | -18/+26 | |
| | | | ||||||
* | | | Merge pull request #1400 from mhils/fix-copy-clipboard | Maximilian Hils | 2016-07-21 | 1 | -5/+8 | |
|\ \ \ | |/ / |/| | | py3: fix copy to clipboard | |||||
| * | | py3: fix copy to clipboard | Maximilian Hils | 2016-07-21 | 1 | -5/+8 | |
|/ / | ||||||
* | | Merge pull request #1397 from mhils/console-fixes | Maximilian Hils | 2016-07-21 | 5 | -24/+14 | |
|\ \ | | | | | | | Console fixes | |||||
| * | | minor fixes | Maximilian Hils | 2016-07-21 | 2 | -14/+1 | |
| | | | ||||||
| * | | improve console ux for duplication/creation | Maximilian Hils | 2016-07-21 | 2 | -2/+5 | |
| | | | ||||||
| * | | fix #1391 | Maximilian Hils | 2016-07-21 | 1 | -3/+3 | |
| | | | ||||||
| * | | fix #1392 | Maximilian Hils | 2016-07-21 | 1 | -2/+2 | |
| | | | ||||||
| * | | fix #1390 | Maximilian Hils | 2016-07-21 | 1 | -3/+3 | |
|/ / | ||||||
* | | display python version in console help | Maximilian Hils | 2016-07-21 | 1 | -1/+3 | |
| | | ||||||
* | | web: perf++ | Maximilian Hils | 2016-07-21 | 3 | -5/+23 | |
|/ | ||||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-07-21 | 10 | -274/+276 | |
|\ | ||||||
| * | Merge pull request #1385 from mitmproxy/console | Aldo Cortesi | 2016-07-21 | 3 | -9/+7 | |
| |\ | | | | | | | console: nopop, rheaders into Options | |||||
| | * | console: nopop, rheaders into Options | Aldo Cortesi | 2016-07-21 | 3 | -9/+7 | |
| |/ | ||||||
| * | console: share one ActionBar instance | Aldo Cortesi | 2016-07-21 | 3 | -4/+4 | |
| | | | | | | | | | | This fixes an issues where popping a view off the stack caused stale ActionBar contents to be displayed. | |||||
| * | Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into ↵ | Aldo Cortesi | 2016-07-21 | 5 | -260/+248 | |
| |\ | | | | | | | | | | dufferzafar-flow-export | |||||
| | * | Fix hotkey kerfuffle | Shadab Zafar | 2016-07-20 | 2 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | `z` (instead of `C`) to "clear flow list or eventlog" `C` to "export flow to clipboard" `E` to "export flow to file" | |||||
| | * | Make necessary changes in flowview | Shadab Zafar | 2016-07-20 | 1 | -23/+28 | |
| | | | ||||||
| | * | Refactor exporters | Shadab Zafar | 2016-07-20 | 3 | -25/+18 | |
| | | | ||||||
| | * | Add a url exporter | Shadab Zafar | 2016-07-20 | 2 | -0/+10 | |
| | | | ||||||
| | * | Ask for scope when called from flowlist | Shadab Zafar | 2016-07-20 | 2 | -63/+80 | |
| | | | ||||||
| | * | Integrate ask_copy_part into exporters | Shadab Zafar | 2016-07-20 | 3 | -27/+23 | |
| | | | | | | | | | | | | This introduces some duplication but that'll be refactored later. | |||||
| | * | Remove raw_request exporter | Shadab Zafar | 2016-07-20 | 2 | -42/+0 | |
| | | | | | | | | | | | | This functionality will be handled by headers+content | |||||
| | * | s/part/key | Shadab Zafar | 2016-07-20 | 2 | -27/+22 | |
| | | | ||||||
| | * | Don't send master and state parameters | Shadab Zafar | 2016-07-20 | 2 | -8/+8 | |
| | | | ||||||
| | * | Refactor | Shadab Zafar | 2016-07-20 | 1 | -111/+112 | |
| | | | ||||||
| | * | Common function for both file and clipboard | Shadab Zafar | 2016-07-20 | 2 | -18/+22 | |
| | | | ||||||
| | * | Export to file (p) or clipboard (P) | Shadab Zafar | 2016-07-20 | 3 | -13/+24 | |
| | | | ||||||
| | * | Exporters list | Shadab Zafar | 2016-07-20 | 3 | -16/+14 | |
| | | |