Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | updated snapshot | Ujjwal Verma | 2017-07-28 | 1 | -2/+2 | |
| * | | fixed addon error | Ujjwal Verma | 2017-07-26 | 6 | -13/+17 | |
* | | | Merge pull request #2478 from pauloromeira/fix-typo | Thomas Kriechbaumer | 2017-07-29 | 1 | -3/+3 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | docs: Fix typo | Paulo Romeira | 2017-07-29 | 1 | -3/+3 | |
|/ / | ||||||
* | | Merge pull request #2476 from mhils/statusbar-tests | Maximilian Hils | 2017-07-27 | 3 | -11/+46 | |
|\ \ | ||||||
| * | | add console statusbar test | Maximilian Hils | 2017-07-27 | 3 | -11/+46 | |
|/ / | ||||||
* | | Merge pull request #2460 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-27 | 11 | -6/+217 | |
|\ \ | ||||||
| * | | [web] Minor fix for frontend and tests. | Matthew Shao | 2017-07-27 | 3 | -8/+11 | |
| * | | [web] Minor Fix for backend. | Matthew Shao | 2017-07-27 | 3 | -15/+6 | |
| * | | [web] Fix tests. | Matthew Shao | 2017-07-26 | 2 | -5/+1 | |
| * | | [web] Fix conflict. | Matthew Shao | 2017-07-26 | 2 | -12/+8 | |
| * | | [web] Update tests. | Matthew Shao | 2017-07-26 | 5 | -41/+20 | |
| * | | [web] Load dumped options at start up. | Matthew Shao | 2017-07-26 | 1 | -0/+6 | |
| * | | [web] Update options auto dump for frontend. | Matthew Shao | 2017-07-26 | 3 | -26/+6 | |
| * | | [web] Update POST /options/dump API in backend. | Matthew Shao | 2017-07-26 | 1 | -9/+3 | |
| * | | [web] Update tests. | Matthew Shao | 2017-07-24 | 3 | -2/+44 | |
| * | | [web] Add Download/Load button to OptionEditor. | Matthew Shao | 2017-07-24 | 2 | -1/+28 | |
| * | | [web] Add /options/dump API to backend. | Matthew Shao | 2017-07-24 | 1 | -1/+18 | |
| * | | [web] Update OptManager.save() to suit the need of mitmweb. | Matthew Shao | 2017-07-24 | 1 | -5/+11 | |
| * | | [web] OptionModal component coverge ++. | Matthew Shao | 2017-07-22 | 3 | -1/+116 | |
| * | | [web] Update tests. | Matthew Shao | 2017-07-21 | 1 | -0/+33 | |
| * | | [web] Add default value suggester in option editor. | Matthew Shao | 2017-07-21 | 1 | -0/+27 | |
* | | | Merge pull request #2473 from mengbiping/postpone-connection | Maximilian Hils | 2017-07-26 | 1 | -10/+13 | |
|\ \ \ | ||||||
| * | | | add comment explaining upstream connect logic | Maximilian Hils | 2017-07-26 | 1 | -0/+2 | |
| * | | | Allow http_connect to create a response for CONNECT request so that connectio... | Biping Meng | 2017-07-26 | 1 | -10/+11 | |
|/ / / | ||||||
* | | | Merge pull request #2469 from Kriechi/nuke-old-openssl | Maximilian Hils | 2017-07-25 | 15 | -244/+109 | |
|\ \ \ | ||||||
| * | | | nuke old openssl | Thomas Kriechbaumer | 2017-07-25 | 14 | -228/+29 | |
| * | | | update cert with too small key | Thomas Kriechbaumer | 2017-07-25 | 1 | -16/+80 | |
| | |/ | |/| | ||||||
* / | | Squashed commit of the following: | Maximilian Hils | 2017-07-25 | 6 | -7/+20 | |
|/ / | ||||||
* | | Merge pull request #2467 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2017-07-24 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | [requires.io] dependency update | requires.io | 2017-07-24 | 1 | -1/+1 | |
* | | | Merge pull request #2466 from Kriechi/update-travis | Thomas Kriechbaumer | 2017-07-24 | 1 | -28/+6 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | update travis | Thomas Kriechbaumer | 2017-07-24 | 1 | -28/+6 | |
* | | | Merge pull request #2459 from mhils/fix-tb | Thomas Kriechbaumer | 2017-07-24 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix addon tracebacks | Maximilian Hils | 2017-07-21 | 1 | -1/+1 | |
| |/ | ||||||
* | | [requires.io] dependency update on master branch (#2435) | Thomas Kriechbaumer | 2017-07-24 | 1 | -2/+2 | |
* | | require latest mypy version (refs #2452) | Maximilian Hils | 2017-07-24 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #2430 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-20 | 17 | -236/+679 | |
|\ | ||||||
| * | [web] Remove js/ducks/ui/option.js | Matthew Shao | 2017-07-20 | 2 | -78/+0 | |
| * | [web] Minor fix and update tests. | Matthew Shao | 2017-07-20 | 12 | -83/+404 | |
| * | [web] Fix line breaking in StringSequenceOption. | Matthew Shao | 2017-07-19 | 1 | -1/+1 | |
| * | [web] sorting the options and minor improve ux. | Matthew Shao | 2017-07-18 | 3 | -267/+13 | |
| * | Merge branch 'mitmweb-options' of https://github.com/MatthewShao/mitmproxy in... | Matthew Shao | 2017-07-18 | 39 | -256/+1109 | |
| |\ | ||||||
| | * | [web] options: add some styling, minor fixes | Maximilian Hils | 2017-07-17 | 2 | -19/+36 | |
| | * | [web] options: make help and err permanently visible, improve perf | Maximilian Hils | 2017-07-17 | 10 | -338/+260 | |
| | * | [web] Update OptionMaster. | Matthew Shao | 2017-07-17 | 2 | -73/+44 | |
| | * | [web] Add reducer and actions for option editor. | Matthew Shao | 2017-07-17 | 2 | -1/+42 | |
| | * | [web] Add simple validation and improve UI. | Matthew Shao | 2017-07-17 | 3 | -18/+61 | |
| | * | [web] Update error msg in PUT /options API. | Matthew Shao | 2017-07-17 | 1 | -1/+1 | |
| | * | [web] Update tests. | Matthew Shao | 2017-07-17 | 1 | -4/+16 |