aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Corrected keep_host_header usage optionAlex Lauerman2018-10-251-1/+1
* Merge pull request #3356 from fghzxm/umask-keysSamoilenko Roman2018-10-252-2/+27
|\
| * use skip_windows decorator consistentlyMaximilian Hils2018-10-231-4/+2
| * Skip file permission test on WindowsFred Miller2018-10-231-0/+4
| * Make private keys readable only by the ownerFred Miller2018-10-222-2/+25
|/
* Merge pull request #3351 from arun-94/masterMaximilian Hils2018-10-213-1/+29
|\
| * Update snapshot testsArun Swaminathan2018-10-202-0/+10
| * Check for null flow response when changing colorArun Swaminathan2018-10-201-5/+5
| * #3312 Change colors according to HTTP status codeArun Swaminathan2018-10-151-1/+19
* | Merge pull request #3355 from kam800/configurable-lines-cutoffMaximilian Hils2018-10-204-5/+12
|\ \ | |/ |/|
| * Make content view lines limit configurableKamil Borzym2018-10-194-5/+12
|/
* Added link_expander.py example to simple examples (#3348)jbrule2018-10-122-0/+29
* Merge pull request #3344 from Tey/masterMaximilian Hils2018-10-101-5/+11
|\
| * Fixed doc about domain whitelistingTey2018-10-051-5/+11
* | Merge pull request #3334 from artnc/patch-1Thomas Kriechbaumer2018-10-101-1/+1
|\ \
| * | Fix error message for failure to start editorArt Chaidarun2018-09-231-1/+1
* | | Merge pull request #3347 from Kriechi/ws-exampleThomas Kriechbaumer2018-10-091-0/+13
|\ \ \ | |_|/ |/| |
| * | add websocket exampleThomas Kriechbaumer2018-10-091-0/+13
|/ /
* | Merge pull request #3340 from kajojify/buttonsSamoilenko Roman2018-09-292-1/+19
|\ \
| * | keys.yaml priority over defaultkeys.py. Test for this.Miroslav2018-09-292-1/+19
|/ /
* | Merge pull request #3335 from Kriechi/bump-wsprotoThomas Kriechbaumer2018-09-231-1/+1
|\ \ | |/ |/|
| * bump wsprotoThomas Kriechbaumer2018-09-231-1/+1
|/
* Merge pull request #3327 from Kriechi/docker-noticeMaximilian Hils2018-09-205-6/+19
|\
| * update docker security warningThomas Kriechbaumer2018-09-181-6/+10
| * add docker security warningThomas Kriechbaumer2018-09-155-5/+14
* | Merge pull request #3328 from bennofs/browser-chrome-unstableMaximilian Hils2018-09-141-0/+1
|\ \ | |/ |/|
| * addons/browser: fallback to google-chrome-unstable as last tryBenno Fünfstück2018-09-141-0/+1
|/
* Merge pull request #3229 from Kriechi/py37Thomas Kriechbaumer2018-09-073-1/+6
|\
| * use travis workaround for py37Thomas Kriechbaumer2018-09-071-0/+2
| * Python 3.7 is hereThomas Kriechbaumer2018-09-073-1/+4
|/
* Merge pull request #3297 from guangchao0831/feature_correct_lib_versionMaximilian Hils2018-09-071-1/+1
|\
| * Merge branch 'master' into feature_correct_lib_versionMaximilian Hils2018-09-0717-337/+355
| |\ | |/ |/|
* | Merge pull request #3320 from mhils/pin-ruamelMaximilian Hils2018-09-071-1/+1
|\ \
| * | pin ruamel.yaml to working versionMaximilian Hils2018-09-071-1/+1
* | | Merge pull request #3319 from mhils/issue-3316Maximilian Hils2018-09-0714-297/+310
|\ \ \
| * | | fix #3316Maximilian Hils2018-09-0714-297/+310
| |/ /
* | | Merge pull request #3294 from elijahbal/masterMaximilian Hils2018-09-072-38/+43
|\ \ \ | |/ / |/| |
| * | [test/xss_scanner] add fixtures in testsDavid Kremer2018-08-151-35/+40
| * | [examples/xss_scanner] replace relative importDavid Kremer2018-08-151-3/+3
* | | update installbuilder urlMaximilian Hils2018-09-041-2/+2
|/ /
| * Lib ruamel.yaml version 0.15.55 will caused typing.Sequence[str] unsupported ...Guangchao2018-08-171-1/+1
|/
* Merge pull request #3277 from madt1m/session-flowcapAldo Cortesi2018-08-144-8/+507
|\
| * session: implemented changes requested after PR review.madt1m2018-08-052-74/+71
| * tests: Full coverage. Everything working, ready for reviewmadt1m2018-08-032-39/+77
| * tests: 97% coverage reached. Session opportunely patched after emerged defects.madt1m2018-08-022-75/+296
| * session: implemented filter and refilter. Ready for testing implementationmadt1m2018-08-012-21/+69
| * protobuf: changed return type annotation in loads to enhance granularitymadt1m2018-08-011-1/+1
| * session: basic flow capture implementedmadt1m2018-08-011-11/+99
| * session: adding methods to capture and store flowsPietro Francesco Tirenna2018-07-281-0/+107
* | Merge pull request #3293 from Eluch/masterMaximilian Hils2018-08-131-0/+1
|\ \