aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2502 from mhils/optmanagerMaximilian Hils2017-08-071-0/+6
|\
| * fix optmanager equality check and deepcopyMaximilian Hils2017-08-051-0/+6
* | Merge pull request #2503 from ujjwal96/optionsMaximilian Hils2017-08-071-0/+36
|\ \
| * | Improve options UXUjjwal Verma2017-08-071-0/+36
* | | Merge pull request #2492 from mhils/addon-containsMaximilian Hils2017-08-052-6/+23
|\ \ \ | |_|/ |/| |
| * | gracefully handle errors during script loadMaximilian Hils2017-08-052-6/+23
| |/
* / improve proxyauth testsThomas Kriechbaumer2017-08-021-188/+233
|/
* add LogEntry.__eq__Maximilian Hils2017-08-011-0/+5
* Merge pull request #2487 from mhils/no-option-processingMaximilian Hils2017-08-013-4/+1
|\
| * remove OptManager._processedMaximilian Hils2017-07-313-4/+1
* | Merge pull request #2484 from mhils/options-into-own-addonMaximilian Hils2017-07-3116-85/+64
|\|
| * fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| * fix tool-specific cmdlineMaximilian Hils2017-07-302-11/+6
| * disentangle ProxyServer and Master classes.Maximilian Hils2017-07-3014-73/+57
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-301-0/+8
|\ \
| * | make option redeclaration silent if signature is the sameMaximilian Hils2017-07-301-0/+8
* | | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-302-34/+28
|\ \ \ | |/ / |/| |
| * | make load_script pureMaximilian Hils2017-07-302-34/+28
| |/
* | Merge pull request #2483 from mhils/ignore-imports-with-hook-namesMaximilian Hils2017-07-301-0/+5
|\ \
| * | gracefully ignore imports with hook namesMaximilian Hils2017-07-291-0/+5
| |/
* | add option type hintsMaximilian Hils2017-07-291-0/+34
* | add OptManager.itemsMaximilian Hils2017-07-291-0/+4
|/
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-291-0/+12
|\
| * Extended intercept tests to include toggle featureMatt Weidner2017-07-271-0/+12
* | Merge pull request #2480 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-294-4/+4
|\ \
| * | Update tests for the improved verbosity options.Matthew Shao2017-07-284-4/+4
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-294-11/+15
|\ \ | |/ |/|
| * fixed addon errorUjjwal Verma2017-07-264-11/+15
* | add console statusbar testMaximilian Hils2017-07-273-11/+46
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-271-1/+3
|\ \
| * | [web] Minor Fix for backend.Matthew Shao2017-07-271-2/+2
| * | [web] Fix tests.Matthew Shao2017-07-262-5/+1
| * | [web] Update tests.Matthew Shao2017-07-262-11/+2
| * | [web] Update tests.Matthew Shao2017-07-242-1/+16
| |/
* | Merge pull request #2469 from Kriechi/nuke-old-opensslMaximilian Hils2017-07-259-145/+90
|\ \
| * | nuke old opensslThomas Kriechbaumer2017-07-258-129/+10
| * | update cert with too small keyThomas Kriechbaumer2017-07-251-16/+80
| |/
* / Squashed commit of the following:Maximilian Hils2017-07-251-0/+4
|/
* fix loading scripts with same filenameMaximilian Hils2017-07-202-0/+25
* Update test_allowremote.pyThomas Kriechbaumer2017-07-151-31/+28
* Allow remote addonUjjwal Verma2017-07-151-0/+41
* Merge pull request #2427 from ujjwal96/protobufThomas Kriechbaumer2017-07-106-43/+92
|\
| * Kaitai parser for protobufUjjwal Verma2017-07-106-43/+92
* | Merge pull request #2423 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-052-4/+25
|\ \
| * | Fix the test for websocket connection.Matthew Shao2017-07-051-2/+22
| * | [web] Add keys argument for dump_dict in optmanager.Matthew Shao2017-07-052-2/+3
* | | add websocket streaming optionUjjwal Verma2017-07-041-0/+1
* | | fix HTTP retry if sending a request fails onceUjjwal Verma2017-07-041-6/+41
* | | websocket streamingUjjwal Verma2017-07-042-1/+41
* | | request streaming for HTTP/2Ujjwal Verma2017-07-041-2/+122