aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix wrong filenameThomas Kriechbaumer2017-02-152-33/+32
|
* Merge pull request #2029 from mhils/proxyauthMaximilian Hils2017-02-153-87/+136
|\ | | | | Improve ProxyAuth
| * improve make_error_responseMaximilian Hils2017-02-152-14/+25
| |
| * fix #1722, fix #1734, refs #2019Maximilian Hils2017-02-152-80/+118
| |
* | ignore compiled mitmweb JS codeThomas Kriechbaumer2017-02-151-1/+1
| |
* | Merge pull request #2028 from Kriechi/nuke-pillowThomas Kriechbaumer2017-02-1511-53/+51
|\ \ | | | | | | nuke Pillow
| * | remove zlib1g dependency from install instructionsThomas Kriechbaumer2017-02-151-2/+2
| | |
| * | image view: add fallback, catch all images but svgsMaximilian Hils2017-02-157-25/+49
| | |
| * | nuke PillowThomas Kriechbaumer2017-02-156-30/+4
| |/
* | Merge pull request #2027 from Kriechi/pytest-pluginThomas Kriechbaumer2017-02-154-122/+163
|\ \ | |/ |/| extract full-coverage pytest plugin
| * extract full-coverage pytest pluginThomas Kriechbaumer2017-02-154-122/+163
|/
* Merge pull request #2026 from Kriechi/filename-matchingThomas Kriechbaumer2017-02-1578-39/+114
|\ | | | | add filename-matching linter
| * fix importsThomas Kriechbaumer2017-02-1421-26/+26
| |
| * restructure and move test filesThomas Kriechbaumer2017-02-1469-11/+28
| | | | | | | | add empty test files to satisfy linter
| * add filename-matching linterThomas Kriechbaumer2017-02-142-0/+58
| |
| * update lint optionsThomas Kriechbaumer2017-02-141-2/+2
|/
* Merge pull request #2024 from MatthewShao/fix_websocket_msg_in_consoleMaximilian Hils2017-02-141-1/+1
|\ | | | | fix websocket message display crash in console.
| * fix websocket message display crash in console.Matthew Shao2017-02-141-1/+1
| |
* | fix typoMaximilian Hils2017-02-141-1/+1
|/
* Merge pull request #2016 from Kriechi/pathod-refactorMaximilian Hils2017-02-131-11/+30
|\ | | | | remove treq from pathoc
| * remove treq from pathocThomas Kriechbaumer2017-02-121-11/+30
| | | | | | | | Using a function intended only for tests in active live code is ugly. However, this whole portion of pathoc could benefit from some further improvements.
* | Merge pull request #2015 from Kriechi/nuke-pypyMaximilian Hils2017-02-132-3/+1
|\ \ | |/ |/| nuke pypy
| * nuke pypyThomas Kriechbaumer2017-02-122-3/+1
|/
* add version info to web footer (#2010)Alireza Mosajjal2017-02-121-1/+4
| | | fixes #1893
* Merge pull request #2000 from s4chin/add-jpeg-parserMaximilian Hils2017-02-1118-40/+1511
|\ | | | | Add jpeg parser
| * Add sources of images, remove copyrighted imageSachin Kelkar2017-02-128-11/+42
| |
| * Fix coverageSachin Kelkar2017-02-111-9/+0
| |
| * Add app1 marker and testsSachin Kelkar2017-02-108-558/+1196
| |
| * Add jpeg app0 sof0 com parsingSachin Kelkar2017-02-107-0/+811
| |
| * Update kaitaistruct version to 0.6Sachin Kelkar2017-02-083-30/+30
| |
* | Merge pull request #2008 from yjh0502/masterMaximilian Hils2017-02-115-1/+61
|\ \ | | | | | | Add transparent proxy support for OpenBSD
| * | Add transparent proxy support for OpenBSDJihyun Yu2017-02-115-1/+61
| | | | | | | | | | | | Add transparent proxy support for OpenBSD with pf divert-to.
* | | consolidate readme shieldsMaximilian Hils2017-02-111-4/+4
|/ /
* | Merge pull request #2005 from ujjwal96/script-reloadMaximilian Hils2017-02-112-2/+12
|\ \ | | | | | | Closes #1828 script reloads on py file changes
| * | closes #1828 script reloads on py file changesUjjwal Verma2017-02-102-2/+12
| | |
* | | Merge pull request #2007 from mitmproxy/update-dependenciesMaximilian Hils2017-02-111-1/+1
|\ \ \ | | | | | | | | Update mypy
| * | | update mypyMaximilian Hils2017-02-111-1/+1
| |/ / | | | | | | The pypi package name has changed.
* | | Merge pull request #2006 from Kriechi/coverage++Maximilian Hils2017-02-1110-75/+95
|\ \ \ | |/ / |/| | coverage++
| * | coverage++Thomas Kriechbaumer2017-02-1010-75/+95
| | |
* | | Update .travis.ymlThomas Kriechbaumer2017-02-101-3/+2
|/ / | | | | otherwise `mitmproxy --version` fails because `git describe` might fail fetching the distance to the last release tag
* | Merge pull request #2004 from mhils/update-dependenciesMaximilian Hils2017-02-101-3/+3
|\ \ | | | | | | update dependencies
| * | update dependenciesMaximilian Hils2017-02-101-3/+3
| | |
* | | fix flaky coverageMaximilian Hils2017-02-101-2/+2
|/ /
* | Merge pull request #2002 from mitmproxy/content_views_editMaximilian Hils2017-02-093-15/+6
|\ \ | | | | | | Content views edit
| * | remove contentview selector and view description if edit mode is oncle10002017-02-082-14/+5
| | |
| * | fix show_lines button visible in edit mode if you change tabscle10002017-02-081-1/+1
| |/
* | Closes #1580 Gives warning when explicit proxy configured in transparent ↵Ujjwal Verma2017-02-092-4/+21
| | | | | | | | mode (#1996)
* | Merge pull request #2003 from Kriechi/coverage++Maximilian Hils2017-02-0925-224/+295
|\ \ | | | | | | test refactoring and coverage++
| * | improve coverage reportThomas Kriechbaumer2017-02-091-6/+12
| | |
| * | minor changesThomas Kriechbaumer2017-02-094-3/+13
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 11:06:10 +0000