aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docs: Fix typoPaulo Romeira2017-07-291-3/+3
* Merge pull request #2476 from mhils/statusbar-testsMaximilian Hils2017-07-273-11/+46
|\
| * add console statusbar testMaximilian Hils2017-07-273-11/+46
|/
* Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2711-6/+217
|\
| * [web] Minor fix for frontend and tests.Matthew Shao2017-07-273-8/+11
| * [web] Minor Fix for backend.Matthew Shao2017-07-273-15/+6
| * [web] Fix tests.Matthew Shao2017-07-262-5/+1
| * [web] Fix conflict.Matthew Shao2017-07-262-12/+8
| * [web] Update tests.Matthew Shao2017-07-265-41/+20
| * [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
| * [web] Update options auto dump for frontend.Matthew Shao2017-07-263-26/+6
| * [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
| * [web] Update tests.Matthew Shao2017-07-243-2/+44
| * [web] Add Download/Load button to OptionEditor.Matthew Shao2017-07-242-1/+28
| * [web] Add /options/dump API to backend.Matthew Shao2017-07-241-1/+18
| * [web] Update OptManager.save() to suit the need of mitmweb.Matthew Shao2017-07-241-5/+11
| * [web] OptionModal component coverge ++.Matthew Shao2017-07-223-1/+116
| * [web] Update tests.Matthew Shao2017-07-211-0/+33
| * [web] Add default value suggester in option editor.Matthew Shao2017-07-211-0/+27
* | Merge pull request #2473 from mengbiping/postpone-connectionMaximilian Hils2017-07-261-10/+13
|\ \
| * | add comment explaining upstream connect logicMaximilian Hils2017-07-261-0/+2
| * | Allow http_connect to create a response for CONNECT request so that connectio...Biping Meng2017-07-261-10/+11
|/ /
* | Merge pull request #2469 from Kriechi/nuke-old-opensslMaximilian Hils2017-07-2515-244/+109
|\ \
| * | nuke old opensslThomas Kriechbaumer2017-07-2514-228/+29
| * | update cert with too small keyThomas Kriechbaumer2017-07-251-16/+80
* | | Squashed commit of the following:Maximilian Hils2017-07-256-7/+20
|/ /
* | Merge pull request #2467 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-07-241-1/+1
|\ \
| * | [requires.io] dependency updaterequires.io2017-07-241-1/+1
* | | Merge pull request #2466 from Kriechi/update-travisThomas Kriechbaumer2017-07-241-28/+6
|\ \ \ | |/ / |/| |
| * | update travisThomas Kriechbaumer2017-07-241-28/+6
* | | Merge pull request #2459 from mhils/fix-tbThomas Kriechbaumer2017-07-241-1/+1
|\ \ \ | |/ / |/| |
| * | fix addon tracebacksMaximilian Hils2017-07-211-1/+1
| |/
* | [requires.io] dependency update on master branch (#2435)Thomas Kriechbaumer2017-07-241-2/+2
* | require latest mypy version (refs #2452)Maximilian Hils2017-07-241-1/+1
|/
* Merge pull request #2430 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2017-236/+679
|\
| * [web] Remove js/ducks/ui/option.jsMatthew Shao2017-07-202-78/+0
| * [web] Minor fix and update tests.Matthew Shao2017-07-2012-83/+404
| * [web] Fix line breaking in StringSequenceOption.Matthew Shao2017-07-191-1/+1
| * [web] sorting the options and minor improve ux.Matthew Shao2017-07-183-267/+13
| * Merge branch 'mitmweb-options' of https://github.com/MatthewShao/mitmproxy in...Matthew Shao2017-07-1839-256/+1109
| |\
| | * [web] options: add some styling, minor fixesMaximilian Hils2017-07-172-19/+36
| | * [web] options: make help and err permanently visible, improve perfMaximilian Hils2017-07-1710-338/+260
| | * [web] Update OptionMaster.Matthew Shao2017-07-172-73/+44
| | * [web] Add reducer and actions for option editor.Matthew Shao2017-07-172-1/+42
| | * [web] Add simple validation and improve UI.Matthew Shao2017-07-173-18/+61
| | * [web] Update error msg in PUT /options API.Matthew Shao2017-07-171-1/+1
| | * [web] Update tests.Matthew Shao2017-07-171-4/+16
| | * [web] Try StringSequence update logic and add tooltip.Matthew Shao2017-07-171-38/+138
| | * [web] Update test.Matthew Shao2017-07-171-80/+99
| | * [web] Add PureStringSequenceOption type to OptionMaster.jsxMatthew Shao2017-07-172-48/+82
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-15 18:13:02 +0000