Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | [web] Update react,react-dom,react-test-renderer to 16-beta.3 | Matthew Shao | 2017-08-08 | 2 | -15/+15 | |
| * | | | [web] Update tests to ensure they won't be disturbed by static mode | Matthew Shao | 2017-08-07 | 3 | -13/+19 | |
| * | | | [web] Add HideInStatic Component | Matthew Shao | 2017-08-07 | 6 | -13/+32 | |
| * | | | [web] Add static backend. | Matthew Shao | 2017-08-07 | 2 | -1/+60 | |
| * | | | [web] Add static.js to index.html, containing MITMWEB_STATIC var. | Matthew Shao | 2017-08-07 | 2 | -0/+2 | |
* | | | | Merge pull request #2502 from mhils/optmanager | Maximilian Hils | 2017-08-07 | 2 | -3/+13 | |
|\ \ \ \ | ||||||
| * | | | | fix optmanager equality check and deepcopy | Maximilian Hils | 2017-08-05 | 2 | -3/+13 | |
* | | | | | Merge pull request #2503 from ujjwal96/options | Maximilian Hils | 2017-08-07 | 3 | -2/+196 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improve options UX | Ujjwal Verma | 2017-08-07 | 3 | -2/+196 | |
* | | | | | | Merge pull request #2492 from mhils/addon-contains | Maximilian Hils | 2017-08-05 | 3 | -8/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | gracefully handle errors during script load | Maximilian Hils | 2017-08-05 | 3 | -8/+26 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2501 from mhils/toxx | Maximilian Hils | 2017-08-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | use py36 where possible | Maximilian Hils | 2017-08-05 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2500 from mitmproxy/add-http2-switch | Maximilian Hils | 2017-08-05 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | re-add --http2 switch | Maximilian Hils | 2017-08-05 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2494 from ujjwal96/intercept-toggle | Thomas Kriechbaumer | 2017-08-04 | 2 | -3/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improve intercept toggle | Ujjwal Verma | 2017-08-02 | 2 | -3/+5 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2499 from mhils/rawtcp | Maximilian Hils | 2017-08-04 | 2 | -4/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Remove promotion to raw TCP based on heuristics" | Maximilian Hils | 2017-08-03 | 1 | -1/+10 | |
| * | | | | | improve docstring for rawtcp | Maximilian Hils | 2017-08-03 | 1 | -3/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2475 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2017-08-02 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | [requires.io] dependency update | requires.io | 2017-08-02 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2496 from Kriechi/bump-pyasn | Thomas Kriechbaumer | 2017-08-02 | 2 | -6/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | bump dependency | Thomas Kriechbaumer | 2017-08-02 | 1 | -1/+1 | |
| * | | | | | update for pyasn1 0.3 | Ujjwal Verma | 2017-08-02 | 1 | -5/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2493 from Kriechi/improve-tests | Maximilian Hils | 2017-08-02 | 1 | -188/+233 | |
|\ \ \ \ \ | ||||||
| * | | | | | improve proxyauth tests | Thomas Kriechbaumer | 2017-08-02 | 1 | -188/+233 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2490 from mitmproxy/issue-2334 | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Update proxyauth.py | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
* | | | | | fix mitmproxy invocation | Maximilian Hils | 2017-08-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | add LogEntry.__eq__ | Maximilian Hils | 2017-08-01 | 2 | -0/+10 | |
* | | | | Merge pull request #2487 from mhils/no-option-processing | Maximilian Hils | 2017-08-01 | 9 | -14/+20 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | remove OptManager._processed | Maximilian Hils | 2017-07-31 | 9 | -14/+20 | |
* | | | | Merge pull request #2488 from MatthewShao/options-into-own-addon | Maximilian Hils | 2017-07-31 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix minor typing mistake. | Matthew Shao | 2017-07-31 | 1 | -1/+1 | |
|/ / / / | ||||||
* | / / | Merge pull request #2484 from mhils/options-into-own-addon | Maximilian Hils | 2017-07-31 | 27 | -170/+183 | |
|\| | | | |/ / |/| | | ||||||
| * | | minor fixes | Maximilian Hils | 2017-07-30 | 2 | -5/+5 | |
| * | | move isatty check to a better place | Maximilian Hils | 2017-07-30 | 2 | -6/+5 | |
| * | | fix tflow.js creation on Windows. | Maximilian Hils | 2017-07-30 | 1 | -1/+1 | |
| * | | fix tool-specific cmdline | Maximilian Hils | 2017-07-30 | 4 | -30/+34 | |
| * | | disentangle ProxyServer and Master classes. | Maximilian Hils | 2017-07-30 | 23 | -121/+130 | |
| * | | move web options into their own addon | Maximilian Hils | 2017-07-29 | 3 | -19/+20 | |
* | | | Merge pull request #2485 from mhils/silent-option-redeclaration | Maximilian Hils | 2017-07-30 | 2 | -1/+20 | |
|\ \ \ | ||||||
| * | | | make option redeclaration silent if signature is the same | Maximilian Hils | 2017-07-30 | 2 | -1/+20 | |
* | | | | Merge pull request #2482 from mhils/pure-script-load | Maximilian Hils | 2017-07-30 | 3 | -51/+43 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | make load_script pure | Maximilian Hils | 2017-07-30 | 3 | -51/+43 | |
| |/ / | ||||||
* | | | Merge pull request #2483 from mhils/ignore-imports-with-hook-names | Maximilian Hils | 2017-07-30 | 2 | -3/+16 | |
|\ \ \ | ||||||
| * | | | gracefully ignore imports with hook names | Maximilian Hils | 2017-07-29 | 2 | -3/+16 | |
| |/ / | ||||||
* | | | Merge pull request #2481 from mhils/option-typehints | Maximilian Hils | 2017-07-30 | 5 | -3/+123 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix type hints for mitmproxy.ctx | Maximilian Hils | 2017-07-29 | 1 | -3/+3 |