Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #2280 from cortesi/coreset | Aldo Cortesi | 2017-04-28 | 6 | -16/+43 | |
|\| | | | ||||||
| * | | | command: partials | Aldo Cortesi | 2017-04-28 | 4 | -16/+8 | |
| * | | | commands: add the core command addon, and the command "set" | Aldo Cortesi | 2017-04-28 | 3 | -0/+35 | |
* | | | | Merge pull request #2279 from cortesi/keymap | Aldo Cortesi | 2017-04-28 | 12 | -114/+317 | |
|\| | | | ||||||
| * | | | console: add a keymap | Aldo Cortesi | 2017-04-28 | 6 | -26/+104 | |
| * | | | console: interactive command browser | Aldo Cortesi | 2017-04-28 | 10 | -91/+216 | |
|/ / / | ||||||
* | | | Merge pull request #2274 from cortesi/alerts | Aldo Cortesi | 2017-04-28 | 3 | -1/+17 | |
|\ \ \ | ||||||
| * | | | Add an "alert" log level. | Aldo Cortesi | 2017-04-27 | 3 | -1/+17 | |
* | | | | Merge pull request #2273 from cortesi/commands | Aldo Cortesi | 2017-04-28 | 24 | -149/+523 | |
|\| | | | ||||||
| * | | | Test coverage ++ | Aldo Cortesi | 2017-04-27 | 4 | -0/+67 | |
| * | | | command: save.file flowspec path -> None | Aldo Cortesi | 2017-04-27 | 8 | -41/+89 | |
| * | | | addons.streamfile -> addons.save | Aldo Cortesi | 2017-04-27 | 9 | -38/+38 | |
| * | | | console: flow resolution command | Aldo Cortesi | 2017-04-27 | 9 | -20/+122 | |
| * | | | console: very basic interactive command executor | Aldo Cortesi | 2017-04-27 | 7 | -5/+44 | |
| * | | | Basic outline of the command subsystem | Aldo Cortesi | 2017-04-27 | 7 | -42/+160 | |
| |/ / | ||||||
* | | | Merge pull request #2277 from Kriechi/bump-cryptography | Thomas Kriechbaumer | 2017-04-27 | 3 | -15/+8 | |
|\ \ \ | ||||||
| * | | | bump cryptography min-version | Thomas Kriechbaumer | 2017-04-27 | 3 | -15/+8 | |
* | | | | Merge pull request #2275 from mitmproxy/mitmweb-change-react-prop-types | Maximilian Hils | 2017-04-27 | 41 | -4817/+5575 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | change import of prop-types | cle1000 | 2017-04-27 | 41 | -4817/+5575 | |
|/ / / | ||||||
* | | | Merge pull request #2265 from cortesi/addons | Aldo Cortesi | 2017-04-27 | 12 | -155/+141 | |
|\ \ \ | ||||||
| * | | | Addons and addon testing | Aldo Cortesi | 2017-04-26 | 12 | -155/+141 | |
| |/ / | ||||||
* | | | Merge pull request #2270 from F1ashhimself/master | Maximilian Hils | 2017-04-26 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Update readme for complex examples | Maksim Beloborodko | 2017-04-26 | 1 | -1/+1 | |
* | | | | Merge pull request #2269 from mhils/issue-2250 | Maximilian Hils | 2017-04-26 | 4 | -50/+58 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | fix #2250, add type info to cookie module | Maximilian Hils | 2017-04-26 | 4 | -50/+58 | |
* | | | | Merge pull request #2258 from mhils/readfile | Maximilian Hils | 2017-04-26 | 10 | -152/+147 | |
|\ \ \ \ | ||||||
| * | | | | separate reading from stdin into its own addon | Maximilian Hils | 2017-04-26 | 6 | -72/+94 | |
| * | | | | integrate readstdin into readfile addon | Maximilian Hils | 2017-04-26 | 5 | -127/+92 | |
| * | | | | typecheck: add support for typing.Any | Maximilian Hils | 2017-04-26 | 2 | -0/+8 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2268 from mhils/issue-2257 | Maximilian Hils | 2017-04-26 | 4 | -79/+110 | |
|\ \ \ \ | ||||||
| * | | | | fix #2257 | Maximilian Hils | 2017-04-26 | 4 | -79/+110 | |
* | | | | | Merge pull request #2267 from MatthewShao/jest-dev | Maximilian Hils | 2017-04-26 | 2 | -0/+164 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | [web] Add coverage for js/utils.js, js/flow/utils.js | Matthew Shao | 2017-04-26 | 2 | -0/+164 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2259 from mhils/2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | fix #2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 | |
| |/ / | ||||||
* / / | clarify that `--cert` expects a leaf certificate | Maximilian Hils | 2017-04-26 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2262 from Kriechi/reduced-coverage++ | Aldo Cortesi | 2017-04-26 | 11 | -18/+16 | |
|\ \ | ||||||
| * | | improve tests | Thomas Kriechbaumer | 2017-04-25 | 11 | -18/+16 | |
* | | | Merge pull request #2264 from cortesi/options | Aldo Cortesi | 2017-04-26 | 44 | -518/+413 | |
|\ \ \ | ||||||
| * | | | configure(options, updated) -> configure(updated) | Aldo Cortesi | 2017-04-26 | 29 | -102/+99 | |
| * | | | Move options into ctx | Aldo Cortesi | 2017-04-26 | 17 | -235/+199 | |
| * | | | Remove watchdog, solidify script testing | Aldo Cortesi | 2017-04-26 | 9 | -184/+118 | |
* | | | | Merge pull request #2261 from cortesi/addonrevamp | Aldo Cortesi | 2017-04-26 | 34 | -533/+448 | |
|\| | | | ||||||
| * | | | Revamp how addons work | Aldo Cortesi | 2017-04-25 | 34 | -533/+448 | |
| |/ / | ||||||
* | | | Merge pull request #2219 from MatthewShao/jest-dev | Maximilian Hils | 2017-04-25 | 4 | -52/+245 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix the tests for flows actions. | Matthew Shao | 2017-04-25 | 2 | -169/+31 | |
| * | | Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest... | Matthew Shao | 2017-04-25 | 27 | -101/+368 | |
| |\ \ | ||||||
| | * | | simplify selectRelative, add example for action testing | Maximilian Hils | 2017-04-24 | 4 | -98/+120 | |
| | * | | [web] Coverage++ for ducks/flows.js | Matthew Shao | 2017-04-24 | 1 | -3/+158 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #2256 from ujjwal96/ip-formatting | Thomas Kriechbaumer | 2017-04-22 | 2 | -3/+4 | |
|\ \ \ |