aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Autoformat for json-rpc callsFerenc soós2018-08-131-0/+1
|/ /
* | Merge pull request #3292 from MatthewShao/fix-mitmwebMaximilian Hils2018-08-132-2/+2
|\ \
| * | [web] Fixes #3228:API endpoint errorMatthew Shao2018-08-132-2/+2
|/ /
* | Merge pull request #3280 from muffl0n/ssl-insecureThomas Kriechbaumer2018-08-031-1/+1
|\ \
| * | Suggest --ssl-insecure cause --insecure is deprecated[OSC] Sven Schliesing2018-08-031-1/+1
|/ /
* | update CHANGELOG for 4.0.4Maximilian Hils2018-07-311-0/+8
* | Update README.mdMaximilian Hils2018-07-311-12/+12
* | Merge pull request #3274 from muffl0n/shorten_notAfter_to_90_daysMaximilian Hils2018-07-311-1/+2
|\ \
| * | Change lifetime of dummy certificate to two years[OSC] Sven Schliesing2018-07-311-1/+1
| * | Add DEFAULT_EXP_DUMMY_CERT and set to 90 days[OSC] Sven Schliesing2018-07-311-1/+2
|/ /
* | Merge pull request #3155 from mitmproxy/requires-io-masterThomas Kriechbaumer2018-07-271-3/+3
|\ \ | |/ |/|
| * bump dependenciesThomas Kriechbaumer2018-07-271-3/+3
* | Merge pull request #3252 from madt1m/session-dbPietro Francesco Tirenna2018-07-244-0/+155
|\ \
| * | session: temporary DB is now stored in temporary dirmadt1m2018-07-242-10/+12
| * | session: modified schema. Now SessionDB uses tempfile module for temp sessionmadt1m2018-07-243-41/+53
| * | test_linting: removed some unused local variablesmadt1m2018-07-201-6/+6
| * | tests: SessionDB fully testedmadt1m2018-07-201-0/+52
| * | exceptions: new SessionLoad exception for load errorsmadt1m2018-07-201-0/+4
| * | session: load/create wrapper methods for SessionDBmadt1m2018-07-201-0/+59
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 21:46:07 +0000