aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | eventsequence: coverage++Thomas Kriechbaumer2017-02-098-96/+72
| | |
| * | coverage whitelist -> blacklistThomas Kriechbaumer2017-02-092-24/+11
| | |
| * | stateobject: coverage++Thomas Kriechbaumer2017-02-091-0/+12
| | |
| * | websockets, tcp, version: coverage++Thomas Kriechbaumer2017-02-0910-66/+171
| | |
| * | remove FIXMEThomas Kriechbaumer2017-02-091-4/+3
| | |
| * | remove verified remarkThomas Kriechbaumer2017-02-091-1/+0
| | |
| * | remove deprecated flow_count functionThomas Kriechbaumer2017-02-093-15/+11
| | |
| * | simplify state copyMaximilian Hils2017-02-092-21/+2
| | |
* | | flow_count() -> len(flows)Maximilian Hils2017-02-091-2/+2
| | |
* | | Merge pull request #1998 from mhils/fix-change-upstreamMaximilian Hils2017-02-092-2/+33
|\ \ \ | |/ / |/| | Fix change_upstream_proxy_server
| * | fix change_upstream_proxy_serverMaximilian Hils2017-02-092-2/+33
| | |
* | | improve stateobject testsMaximilian Hils2017-02-091-1/+7
| | |
* | | Merge pull request #2001 from mitmproxy/issue#40_response_body_editMaximilian Hils2017-02-091-1/+0
|\ \ \ | | | | | | | | fix response body edit issue
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 22:37:43 +0000