Commit Graph

7977 Commits

Author SHA1 Message Date
Thomas Kriechbaumer
6f893a83c0
Merge pull request #3382 from abhigyank/org
Change variable o to organization for generated certficates.
2018-11-12 09:34:16 +01:00
Abhigyan Khaund
cda4248610 Change variable o to organization for generated certficates. 2018-11-11 10:58:14 +05:30
Abcdefghijklmnopqrstuvwxyzxyz
d4f4cfe225 Add Organization field for the generated certificate (#3376)
add organization field for the generated certificate
2018-11-09 09:06:04 +01:00
Maximilian Hils
3f3ed4743a
Merge pull request #3371 from JessicaFavin/proper-display-on-stderr
Display errors on sys.stderr
2018-11-09 08:58:41 +01:00
Maximilian Hils
ef485fa5cc
Merge pull request #3374 from abhigyank/docs
docs: Add mitm.it link in the certificates docs.
2018-11-09 08:57:05 +01:00
Maximilian Hils
08f2459cbd
docs: don't make links extra bold 2018-11-09 08:56:48 +01:00
Abhigyan Khaund
80f5cf5437 docs: Add mitm.it link in the certificates docs. 2018-11-05 02:15:48 +05:30
JessicaFavin
fd1efc8852 Remove indent on echo_error 2018-11-04 19:18:32 +01:00
Jessica Favin
0cbbcffd89 test_dumper.py - Add sio_err everywhere + adjust test_simple 2018-11-04 17:24:34 +01:00
Jessica Favin
312f922316 Fix test_dumper.py - Dumper constructor 2018-11-04 16:26:51 +01:00
Jessica Favin
ade136dc4d Update test_dumper.py 2018-11-04 16:06:17 +01:00
Jessica Favin
2e9a34faa9 Display errors on sys.stderr 2018-11-01 19:53:37 +01:00
Maximilian Hils
c2e2fd1751
Merge pull request #3366 from alexlauerman/patch-3
Corrected keep_host_header usage option
2018-10-26 16:52:31 +02:00
Alex Lauerman
93cb73e2cd
Corrected keep_host_header usage option
I tested this locally to verify this change is correct.
2018-10-25 16:15:55 -05:00
Samoilenko Roman
997a20e652
Merge pull request #3356 from fghzxm/umask-keys
Make private keys readable only by the owner
2018-10-25 11:23:20 +03:00
Maximilian Hils
28551e9655
use skip_windows decorator consistently 2018-10-23 15:24:59 +02:00
Fred Miller
bf3570b3b9
Skip file permission test on Windows 2018-10-23 08:53:51 +08:00
Fred Miller
f16621a38b
Make private keys readable only by the owner 2018-10-22 22:53:58 +08:00
Maximilian Hils
e8d76d050d
Merge pull request #3351 from arun-94/master
#3312 Change colors according to the HTTP status code
2018-10-21 14:48:58 +02:00
Arun Swaminathan
a6ba88ae64 Update snapshot tests 2018-10-20 04:05:07 -04:00
Arun Swaminathan
c1184176e7 Check for null flow response when changing color 2018-10-20 04:04:55 -04:00
Maximilian Hils
0d320e778d
Merge pull request #3355 from kam800/configurable-lines-cutoff
Make content view lines limit configurable
2018-10-20 00:08:44 +02:00
Kamil Borzym
41cef4e9e3 Make content view lines limit configurable 2018-10-19 15:58:53 +02:00
Arun Swaminathan
028dd78291 #3312 Change colors according to HTTP status code 2018-10-15 22:43:22 -04:00
jbrule
57868ef5fa Added link_expander.py example to simple examples (#3348) 2018-10-12 21:56:58 +02:00
Maximilian Hils
82797efe9f
Merge pull request #3344 from Tey/master
Fixed doc about domain whitelisting
2018-10-10 17:07:16 +02:00
Thomas Kriechbaumer
eace39f670
Merge pull request #3334 from artnc/patch-1
Fix error message for failure to start editor
2018-10-10 17:03:27 +02:00
Thomas Kriechbaumer
c30b46147e
Merge pull request #3347 from Kriechi/ws-example
add websocket example
2018-10-09 19:03:17 +02:00
Thomas Kriechbaumer
13e1f8b421 add websocket example 2018-10-09 18:34:57 +02:00
Tey
1752fac0d8
Fixed doc about domain whitelisting 2018-10-05 04:05:18 +02:00
Samoilenko Roman
a8b809dcbc
Merge pull request #3340 from kajojify/buttons
keys.yaml priority over defaultkeys.py
2018-09-29 16:21:46 +03:00
Miroslav
ed9e3d5137 keys.yaml priority over defaultkeys.py. Test for this. 2018-09-29 15:54:17 +03:00
Thomas Kriechbaumer
7f5d8d0997
Merge pull request #3335 from Kriechi/bump-wsproto
bump wsproto
2018-09-23 14:09:04 +02:00
Thomas Kriechbaumer
afdcb944e1 bump wsproto 2018-09-23 13:46:45 +02:00
Art Chaidarun
769aad0515
Fix error message for failure to start editor 2018-09-23 00:20:34 -04:00
Maximilian Hils
4be387d654
Merge pull request #3327 from Kriechi/docker-notice
add docker security warning
2018-09-20 17:34:10 +02:00
Thomas Kriechbaumer
73577eb607 update docker security warning 2018-09-18 20:42:48 +02:00
Thomas Kriechbaumer
cf15da1ed5 add docker security warning 2018-09-15 14:01:34 +02:00
Maximilian Hils
97244a7e0e
Merge pull request #3328 from bennofs/browser-chrome-unstable
addons/browser: fallback to google-chrome-unstable as last try
2018-09-14 18:19:24 +02:00
Benno Fünfstück
2cf29f1060 addons/browser: fallback to google-chrome-unstable as last try 2018-09-14 18:15:42 +02:00
Thomas Kriechbaumer
6c0849aa46
Merge pull request #3229 from Kriechi/py37
Python 3.7 is here
2018-09-07 18:14:01 +02:00
Thomas Kriechbaumer
a2e6c47a2b use travis workaround for py37 2018-09-07 17:48:06 +02:00
Thomas Kriechbaumer
925bba4c3c Python 3.7 is here 2018-09-07 17:48:06 +02:00
Maximilian Hils
6c2e15fce3
Merge pull request #3297 from guangchao0831/feature_correct_lib_version
Lib ruamel.yaml version 0.15.55 will cause typing.Sequence[str] unsupported in option.
2018-09-07 14:46:58 +02:00
Maximilian Hils
03cb77a5e0
Merge branch 'master' into feature_correct_lib_version 2018-09-07 14:46:19 +02:00
Maximilian Hils
9564b7a0b2
Merge pull request #3320 from mhils/pin-ruamel
Pin ruamel.yaml to working version
2018-09-07 13:59:15 +02:00
Maximilian Hils
34e35f5e5a pin ruamel.yaml to working version 2018-09-07 13:41:34 +02:00
Maximilian Hils
e15619f34e
Merge pull request #3319 from mhils/issue-3316
Fix #3316
2018-09-07 10:34:55 +02:00
Maximilian Hils
53e7761876
Merge pull request #3294 from elijahbal/master
Fix XSS scanner failure in test_xss_scanner.py
2018-09-07 10:32:40 +02:00
Maximilian Hils
1b6a8d6acd fix #3316 2018-09-07 10:24:28 +02:00