Commit Graph

  • ccca04b450 Fix coverage Sachin Kelkar 2017-02-11 14:48:03 +05:30
  • 4adc575bad Add transparent proxy support for OpenBSD Jihyun Yu 2017-02-11 13:16:09 +09:00
  • 71742654e3 Merge pull request #2005 from ujjwal96/script-reload Maximilian Hils 2017-02-11 01:45:14 +01:00
  • d4593bc333 Merge pull request #2007 from mitmproxy/update-dependencies Maximilian Hils 2017-02-11 01:43:44 +01:00
  • 85542bd12b Merge pull request #2006 from Kriechi/coverage++ Maximilian Hils 2017-02-11 01:43:27 +01:00
  • 705ffd6d06 update mypy Maximilian Hils 2017-02-11 00:14:49 +01:00
  • c8c79cc291 coverage++ Thomas Kriechbaumer 2017-02-10 22:12:24 +01:00
  • 8eb1d34644 Add app1 marker and tests Sachin Kelkar 2017-02-10 22:40:19 +05:30
  • 809207195d closes #1828 script reloads on py file changes Ujjwal Verma 2017-02-10 20:53:28 +05:30
  • d4264cb719 Update .travis.yml Thomas Kriechbaumer 2017-02-10 16:37:22 +01:00
  • d70f7cd8cc Merge pull request #2004 from mhils/update-dependencies Maximilian Hils 2017-02-10 15:28:10 +01:00
  • 43867dbd98 fix flaky coverage Maximilian Hils 2017-02-10 15:28:02 +01:00
  • 1c8836a8d6 update dependencies Maximilian Hils 2017-02-10 14:38:05 +01:00
  • c4e141a000 Add jpeg app0 sof0 com parsing Sachin Kelkar 2017-02-10 10:56:50 +05:30
  • 74c991d70b Merge pull request #2002 from mitmproxy/content_views_edit Maximilian Hils 2017-02-09 23:21:44 +01:00
  • d6465b907f Closes #1580 Gives warning when explicit proxy configured in transparent mode (#1996) Ujjwal Verma 2017-02-10 01:26:06 +05:30
  • 380ff50e57 Merge pull request #2003 from Kriechi/coverage++ Maximilian Hils 2017-02-09 17:45:50 +01:00
  • da8444b11f flow_count() -> len(flows) Maximilian Hils 2017-02-09 16:44:27 +01:00
  • 1084588103 Merge pull request #1998 from mhils/fix-change-upstream Maximilian Hils 2017-02-09 16:39:20 +01:00
  • d10560d54c improve coverage report Thomas Kriechbaumer 2017-02-09 15:58:23 +01:00
  • 2ff5d72236 minor changes Thomas Kriechbaumer 2017-02-09 14:06:36 +01:00
  • 0299bb5b2e eventsequence: coverage++ Thomas Kriechbaumer 2017-02-09 11:56:38 +01:00
  • 5a3976c43e coverage whitelist -> blacklist Thomas Kriechbaumer 2017-02-09 11:20:53 +01:00
  • f6cea09d5a stateobject: coverage++ Thomas Kriechbaumer 2017-02-08 17:37:08 +01:00
  • 1847cf175c websockets, tcp, version: coverage++ Thomas Kriechbaumer 2017-02-08 15:00:31 +01:00
  • 2134b5b06a remove FIXME Thomas Kriechbaumer 2017-02-08 17:36:46 +01:00
  • b5f0342664 remove verified remark Thomas Kriechbaumer 2017-02-08 14:34:55 +01:00
  • ae94ca6fa9 remove deprecated flow_count function Thomas Kriechbaumer 2017-02-08 13:44:02 +01:00
  • d6d1ff0170 simplify state copy Maximilian Hils 2017-02-09 14:34:31 +01:00
  • 9b97b63891 fix change_upstream_proxy_server Maximilian Hils 2017-02-08 11:49:22 +01:00
  • 7a205e80aa improve stateobject tests Maximilian Hils 2017-02-09 14:21:25 +01:00
  • fa661217c1 Merge pull request #2001 from mitmproxy/issue#40_response_body_edit Maximilian Hils 2017-02-09 13:29:41 +01:00
  • 4cf6047a4e Merge pull request #1999 from Kriechi/coverage++ Maximilian Hils 2017-02-09 10:42:55 +01:00
  • fb06c66437 remove contentview selector and view description if edit mode is on cle1000 2017-02-08 21:09:03 +01:00
  • b4bed57d4c fix show_lines button visible in edit mode if you change tabs cle1000 2017-02-08 21:07:40 +01:00
  • 7a9d40817c pytest.raises: shim new API Thomas Kriechbaumer 2017-02-06 17:48:44 +01:00
  • dae0c23ec8 fix response body edit issue cle1000 2017-02-08 19:57:57 +01:00
  • 5dd54ef012 Update kaitaistruct version to 0.6 Sachin Kelkar 2017-02-08 21:16:17 +05:30
  • 28c0596742 Merge pull request #1997 from s4chin/add-gif-parser Maximilian Hils 2017-02-08 12:09:48 +01:00
  • 79354c0b43 Merge pull request #1984 from ujjwal96/har_dump-fix Maximilian Hils 2017-02-08 12:01:32 +01:00
  • 66ad95c330 Fix gif parsing error on some gifs and add test Sachin Kelkar 2017-02-08 00:03:07 +05:30
  • 4ef5de2cce Add gif parser and tests Sachin Kelkar 2017-02-06 17:57:59 +05:30
  • c622622c59 Encoding fixes and tests Ujjwal Verma 2017-02-05 18:59:01 +05:30
  • 2316c0fb74 Merge pull request #1993 from Kriechi/coverage++ Thomas Kriechbaumer 2017-02-05 11:29:27 +01:00
  • 288f9a3857 fix flaky test Thomas Kriechbaumer 2017-02-05 10:42:47 +01:00
  • d133b8baee Merge pull request #1989 from Kriechi/coverage++ Maximilian Hils 2017-02-04 16:05:11 +01:00
  • 966ffaa3d6 coverage++ Thomas Kriechbaumer 2017-02-04 13:34:50 +01:00
  • 155670766e Merge pull request #1988 from krsoninikhil/ordereddict Maximilian Hils 2017-02-04 13:46:44 +01:00
  • e6de57ccc6 Changes view._store from dict to OrderedDict Nikhil Soni 2017-02-04 17:44:22 +05:30
  • 53f298ac41 Merge pull request #1967 from s4chin/remove-pillow Maximilian Hils 2017-02-03 18:58:34 +01:00
  • bbdb7300fd Merge pull request #1983 from Kriechi/coverage++ Maximilian Hils 2017-02-03 18:56:56 +01:00
  • 15548ff433 Feedback Sachin Kelkar 2017-02-03 17:32:55 +05:30
  • 85e39b86bb update installbuilder Maximilian Hils 2017-02-03 12:04:11 +01:00
  • bcaaa2f40b coverage++ Thomas Kriechbaumer 2017-02-03 11:55:33 +01:00
  • 3f26a0b5a5 Merge pull request #1982 from ujjwal96/preserve-marked-flows Maximilian Hils 2017-02-03 11:43:57 +01:00
  • 0674485e76 Fix and cleanup Sachin Kelkar 2017-02-03 15:02:35 +05:30
  • 88dbfd5257 Add iTXt and zTXt tests Sachin Kelkar 2017-02-02 18:01:48 +05:30
  • abef020e07 Fix as per feedback and add more tests Sachin Kelkar 2017-02-02 16:30:01 +05:30
  • 6202958048 Add png parser Sachin Kelkar 2017-01-30 22:50:35 +05:30
  • e10c36fe11 Added test Ujjwal Verma 2017-02-03 02:58:02 +05:30
  • 11b4b3209d Closes #1960 'Z' removes unmarked flows Ujjwal Verma 2017-02-03 01:35:53 +05:30
  • 79aa994275 fix merge Thomas Kriechbaumer 2017-02-01 16:48:46 +01:00
  • 8b6e3d8bd3 Merge pull request #1979 from 0neblock/master Maximilian Hils 2017-02-02 17:24:04 +01:00
  • 3f4d472c80 Merge pull request #1980 from Kriechi/improve-tests Thomas Kriechbaumer 2017-02-02 17:23:11 +01:00
  • 4f0b2bc4de adapt coverage checks Thomas Kriechbaumer 2017-02-02 14:20:56 +01:00
  • 00a6551622 Fixed following on flowlist Aidan Cyr 2017-02-02 23:00:47 +11:00
  • ae008ed80b replace tutils.raises with pytest.raises + shim Thomas Kriechbaumer 2017-02-01 16:48:46 +01:00
  • ec92d7f67e cleanup test utils Thomas Kriechbaumer 2017-02-01 16:17:22 +01:00
  • c1bc1ea584 Merge pull request #1959 from Kriechi/coverage-fail Thomas Kriechbaumer 2017-02-02 12:55:33 +01:00
  • 6e329595ca add test coverage protection Thomas Kriechbaumer 2017-01-23 22:53:56 +01:00
  • 380d8ec370 increase test coverage Thomas Kriechbaumer 2017-01-25 21:12:11 +01:00
  • 3ae060f0d3 fix console test Thomas Kriechbaumer 2017-02-02 10:13:12 +01:00
  • 2606de25e4 fix linting error Thomas Kriechbaumer 2017-02-02 09:36:33 +01:00
  • 7b2a986cea tests++ (#1976) Maximilian Hils 2017-02-01 17:52:01 +01:00
  • 4b10212caf Add except clause to catch script parsing errors (#1929) lymanZerga11 2017-02-01 22:27:10 +08:00
  • 212d9f1b98 Merge pull request #1948 from amm0nite/fix_dns_spoofing_example Maximilian Hils 2017-02-01 15:25:51 +01:00
  • cf991ba4e2 Merge pull request #1974 from cortesi/setheaders Aldo Cortesi 2017-02-01 16:47:19 +13:00
  • f44dab5d26 Merge pull request #1973 from cortesi/replace Aldo Cortesi 2017-02-01 13:03:29 +13:00
  • 914659e888 Regularise setheaders options Aldo Cortesi 2017-02-01 12:19:51 +13:00
  • 9e3f06b7f2 Better test Ammonite 2017-01-31 23:23:13 +01:00
  • 4cc75a9560 Revamp replacement hooks Aldo Cortesi 2017-02-01 11:01:47 +13:00
  • 02f51d043d Merge pull request #1965 from cortesi/optname Aldo Cortesi 2017-02-01 08:39:35 +13:00
  • ff379b7665 fully test addonmanager (#1970) Thomas Kriechbaumer 2017-01-31 10:57:22 +01:00
  • 1523068b03 Merge pull request #1964 from mhils/new-contribution-docs Maximilian Hils 2017-01-31 09:02:00 +01:00
  • e2e15df358 Add a test for the host replacement Ammonite 2017-01-30 23:44:13 +01:00
  • aaff9dfd32 Reset the host header to the correct destination Ammonite 2017-01-30 23:41:47 +01:00
  • 980b8aedd3 Update shim path (#1968) Markus Unterwaditzer 2017-01-30 20:07:37 +01:00
  • 45ace793d0 🙈 Maximilian Hils 2017-01-30 19:30:35 +01:00
  • 4746ce939f README: py.test -> pytest Maximilian Hils 2017-01-30 16:46:22 +01:00
  • 3fe2f9578a always use 'venv' as virtualenv folder Maximilian Hils 2017-01-30 00:38:40 +01:00
  • f570c57006 add contributing section to README, remove autoenv Maximilian Hils 2017-01-30 00:28:56 +01:00
  • 35aff3b783 Consolidate option names Aldo Cortesi 2017-01-29 12:28:52 +13:00
  • a384dea62b rework README dev sections Maximilian Hils 2017-01-29 23:06:50 +01:00
  • edb96f69f5 add contributing section that redirects to README Maximilian Hils 2017-01-29 22:10:37 +01:00
  • e10fb22f9c remove outdated testing section from docs Maximilian Hils 2017-01-29 22:09:45 +01:00
  • 0919e38514 remove outdated architecture section from docs Maximilian Hils 2017-01-29 22:08:57 +01:00
  • c2c6050df3 Store original host in flow metadata Ammonite 2017-01-29 14:33:53 +01:00
  • 695cc23696 Merge pull request #1963 from cortesi/cover Aldo Cortesi 2017-01-29 12:04:54 +13:00
  • 356c4987a2 addons: unit tests to 100% Aldo Cortesi 2017-01-29 11:37:51 +13:00
  • d24f76c98e fix newlines on windows Thomas Kriechbaumer 2017-01-25 18:36:43 +01:00