aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2302 from cortesi/flowviewAldo Cortesi2017-05-015-233/+109
|\
| * commands: view.setval, view.getval, view.setval.toggleAldo Cortesi2017-05-015-233/+109
* | Merge pull request #2301 from cortesi/encodingAldo Cortesi2017-05-014-38/+93
|\|
| * commands: flow.encode, flow.decode, flow.encode.toggleAldo Cortesi2017-05-014-38/+93
* | Merge pull request #2300 from cortesi/consolerevampAldo Cortesi2017-05-0123-681/+664
|\|
| * commands: console.bodyview, console.chooseAldo Cortesi2017-05-012-14/+60
| * keymap: keys can now bind to multiple contextsAldo Cortesi2017-05-019-187/+136
| * command: flow.setAldo Cortesi2017-05-014-134/+123
| * Refactor consoleAldo Cortesi2017-05-0117-366/+365
|/
* Merge pull request #2285 from MatthewShao/jest-devMaximilian Hils2017-04-304-5/+110
|\
| * [web] Export updateUrlFromStore and updateStoreFromUrlMatthew Shao2017-04-302-25/+46
| * [web] Introduce redux-mock-store and minor fix.Matthew Shao2017-04-304-44/+64
| * [web] Add coverage for js/urlState.jsMatthew Shao2017-04-281-0/+66
* | Merge pull request #2271 from mhils/mitmweb-connection-indicatorMaximilian Hils2017-04-3014-4658/+5128
|\ \
| * | [web] add connection testsMaximilian Hils2017-04-294-16/+63
| * | [web] add connection indicatorMaximilian Hils2017-04-2912-4655/+5078
* | | Merge pull request #2297 from cortesi/flowcmdAldo Cortesi2017-05-017-91/+52
|\ \ \
| * | | commands: view.order.options, view.marked.toggle, view.createAldo Cortesi2017-04-307-91/+52
* | | | Merge pull request #2296 from cortesi/viewloadAldo Cortesi2017-04-3028-653/+385
|\| | |
| * | | commands: view.loadAldo Cortesi2017-04-307-27/+39
| * | | commands: support *args for commandsAldo Cortesi2017-04-306-47/+122
| * | | Move export to addon, kill Python and Locust exportAldo Cortesi2017-04-3023-586/+231
* | | | fix markdownThomas Kriechbaumer2017-04-301-4/+4
* | | | update docker-release tags during releaseThomas Kriechbaumer2017-04-301-0/+4
* | | | Merge pull request #2293 from cortesi/clipAldo Cortesi2017-04-303-0/+47
|\| | |
| * | | commands: cut.clip copies cuts to system clipboardAldo Cortesi2017-04-303-0/+47
* | | | Merge pull request #2291 from cortesi/cutsAldo Cortesi2017-04-3013-13/+351
|\| | |
| * | | Add help text to --commands outputAldo Cortesi2017-04-303-5/+16
| * | | cut: more flexible cut specification based on attribute pathsAldo Cortesi2017-04-304-50/+79
| * | | cut: use csv module to encode multi-values for savingAldo Cortesi2017-04-302-27/+60
| * | | Introduce cuts: a flow dissectorAldo Cortesi2017-04-2910-5/+270
* | | | Merge pull request #2276 from mitmproxy/add-examples-to-script-docsMaximilian Hils2017-04-291-0/+6
|\ \ \ \
| * | | | prominently link to examples in script docsMaximilian Hils2017-04-271-0/+6
* | | | | Merge pull request #2221 from iharsh234/mypy-master-example/simpleAldo Cortesi2017-04-2913-19/+34
|\ \ \ \ \
| * | | | | Fixed lint errorharsh vijay2017-04-291-1/+1
| * | | | | lint error fixedharsh vijay2017-04-291-1/+1
| * | | | | extend mypy example/simpleharsh vijay2017-04-2913-19/+34
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2290 from cortesi/scriptrunAldo Cortesi2017-04-294-90/+70
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | command: script.runAldo Cortesi2017-04-294-90/+70
* | | | | Merge pull request #2289 from cortesi/flowrevertAldo Cortesi2017-04-294-8/+28
|\| | | |
| * | | | command: flow.revertAldo Cortesi2017-04-294-8/+28
* | | | | Merge pull request #2288 from cortesi/replayfilesAldo Cortesi2017-04-294-0/+37
|\| | | |
| * | | | commands: "replay.client.file" and "replay.server.file"Aldo Cortesi2017-04-294-0/+37
* | | | | Merge pull request #2287 from cortesi/cmdmarkAldo Cortesi2017-04-2910-82/+152
|\| | | |
| * | | | Rework client and server replayAldo Cortesi2017-04-298-81/+71
| * | | | command: flow.kill, flow.replayAldo Cortesi2017-04-294-15/+48
| * | | | commands: markingAldo Cortesi2017-04-296-11/+58
* | | | | Merge pull request #2283 from cortesi/cmdallAldo Cortesi2017-04-2911-158/+251
|\| | | | | |/ / / |/| | |
| * | | commands: view.goAldo Cortesi2017-04-299-75/+153
| * | | Commands, core update eventAldo Cortesi2017-04-2910-89/+104
|/ / /