aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix query arrayRajat Gupta2018-12-035-13/+47
| | | | fixes #3072 closes #3254
* Merge pull request #3403 from Kriechi/bump-depsThomas Kriechbaumer2018-12-0216-27/+30
|\ | | | | bump dependencies
| * bump dependenciesThomas Kriechbaumer2018-12-0216-27/+30
|/
* Merge pull request #3401 from rjt-gupta/fix-replay-timestampsThomas Kriechbaumer2018-12-011-0/+2
|\ | | | | client-replay-fix
| * client-replay-fixrjt-gupta2018-12-011-0/+2
|/
* Merge pull request #3382 from abhigyank/orgThomas Kriechbaumer2018-11-123-21/+21
|\ | | | | Change variable o to organization for generated certficates.
| * Change variable o to organization for generated certficates.Abhigyan Khaund2018-11-113-21/+21
|/
* Add Organization field for the generated certificate (#3376)Abcdefghijklmnopqrstuvwxyzxyz2018-11-093-6/+28
| | | add organization field for the generated certificate
* Merge pull request #3371 from JessicaFavin/proper-display-on-stderrMaximilian Hils2018-11-092-11/+41
|\ | | | | Display errors on sys.stderr
| * Remove indent on echo_errorJessicaFavin2018-11-041-3/+1
| |
| * test_dumper.py - Add sio_err everywhere + adjust test_simpleJessica Favin2018-11-041-4/+26
| |
| * Fix test_dumper.py - Dumper constructorJessica Favin2018-11-041-2/+2
| |
| * Update test_dumper.pyJessica Favin2018-11-041-2/+4
| |
| * Display errors on sys.stderrJessica Favin2018-11-011-3/+11
| |
* | Merge pull request #3374 from abhigyank/docsMaximilian Hils2018-11-091-1/+1
|\ \ | |/ |/| docs: Add mitm.it link in the certificates docs.
| * docs: don't make links extra boldMaximilian Hils2018-11-091-1/+1
| |
| * docs: Add mitm.it link in the certificates docs.Abhigyan Khaund2018-11-051-1/+1
|/
* Merge pull request #3366 from alexlauerman/patch-3Maximilian Hils2018-10-261-1/+1
|\ | | | | Corrected keep_host_header usage option
| * Corrected keep_host_header usage optionAlex Lauerman2018-10-251-1/+1
|/ | | I tested this locally to verify this change is correct.
* Merge pull request #3356 from fghzxm/umask-keysSamoilenko Roman2018-10-252-2/+27
|\ | | | | Make private keys readable only by the owner
| * 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
|\ | | | | #3312 Change colors according to the HTTP status code
| * 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 configurable
| * 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 whitelisting
| * 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 editor
| * | 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 example
| * | 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
| * | 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 wsproto
| * bump wsprotoThomas Kriechbaumer2018-09-231-1/+1
|/
* Merge pull request #3327 from Kriechi/docker-noticeMaximilian Hils2018-09-205-6/+19
|\ | | | | add docker security warning
| * 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 try
| * 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
|\ | | | | Python 3.7 is here
| * 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
|\ | | | | Lib ruamel.yaml version 0.15.55 will cause typing.Sequence[str] unsupported in option.
| * Merge branch 'master' into feature_correct_lib_versionMaximilian Hils2018-09-0717-337/+355
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-12 13:37:14 +0000