aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* - working WBXML parserDavid Shaw2014-05-069-0/+1200
|
* Merge pull request #269 from shvar/masterMaximilian Hils2014-04-291-1/+3
|\ | | | | init ProxyConfig.certstore with custom certs
| * fix default certsEli Shvartsman2014-04-291-1/+1
| |
| * init ProxyConfig.certstore with custom certsEli Shvartsman2014-04-291-0/+2
| |
* | Merge pull request #268 from shvar/patch-1Maximilian Hils2014-04-291-1/+1
|\ \ | |/ |/| Fix upstream_cert call in case of https2http
| * Update server.pyEli Shvartsman2014-04-291-1/+1
|/ | | | | We should ask for upstream cert only if there is: 1) no no_upstream_cert option specified 2) ssl connection to server is established
* Fix proxy optionsAldo Cortesi2014-04-121-2/+2
|
* update firefox cert install docsMaximilian Hils2014-04-101-2/+2
|
* fix issue #260Maximilian Hils2014-04-071-1/+3
|
* Merge pull request #252 from jeanregisser/masterMaximilian Hils2014-03-261-1/+0
|\ | | | | Fixed palette forced to light in mitmproxywrapper.py
| * Fixed palette forced to light in mitmproxywrapper.pyJean Regisser2014-03-261-1/+0
|/
* beef up error messagesMaximilian Hils2014-03-261-1/+1
|
* add requests to requrements, improve error loggingMaximilian Hils2014-03-192-1/+5
|
* fix minor version stringMaximilian Hils2014-03-191-1/+1
|
* fix display bugs (fixes #243)Maximilian Hils2014-03-182-2/+7
|
* Merge pull request #239 from mitmproxy/options_cleanupMaximilian Hils2014-03-189-85/+85
|\ | | | | Options cleanup
| * forward proxy -> upstream proxyMaximilian Hils2014-03-147-20/+20
| |
| * remove debug switchMaximilian Hils2014-03-132-7/+1
| |
| * order command line options, add disting proxy option groupMaximilian Hils2014-03-132-64/+70
| |
* | Merge pull request #238 from mitmproxy/log_levelsMaximilian Hils2014-03-1816-99/+105
|\| | | | | Log Levels
| * adjust command line docs, fix log typoMaximilian Hils2014-03-133-4/+4
| |
| * fix linux tests...Maximilian Hils2014-03-131-6/+6
| |
| * adjust tests, fix option handlingMaximilian Hils2014-03-135-17/+11
| |
| * add support for log levelsMaximilian Hils2014-03-1310-60/+65
| |
| * add -d switch to mitmdump to compensate for old verbosity functionalityMaximilian Hils2014-03-124-15/+24
| |
| * restrict -e to mitmproxy only (not mitmdump)Maximilian Hils2014-03-126-16/+14
| |
* | fix #240Maximilian Hils2014-03-181-1/+1
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-114-24/+45
|\
| * Certificate forwarding.Aldo Cortesi2014-03-114-24/+45
| |
* | fix temporary server change, coverage++Maximilian Hils2014-03-114-15/+70
|/
* always use relative imports, fix status bar bugMaximilian Hils2014-03-1027-30/+54
|
* split up protocol\__init__.pyMaximilian Hils2014-03-108-116/+113
|
* Merge branch 'absolutely_relative_proxying'Maximilian Hils2014-03-1018-233/+260
|\
| * update docs, fix #215Maximilian Hils2014-03-105-27/+29
| |
| * add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-1014-164/+182
| |
| * lay the foundations for --(in|out)(abs|rel) command line switches, as ↵Maximilian Hils2014-03-106-61/+68
| | | | | | | | proposed in https://groups.google.com/forum/#!topic/mitmproxy/nApno2TXS0c
* | Merge pull request #231 from benwa/patch-1Aldo Cortesi2014-03-101-0/+3
|\ \ | | | | | | Update webapp.html
| * | Update webapp.htmlBennett Blodinger2014-03-081-0/+3
| | | | | | | | | Add notice about data compression proxies
* | | Merge pull request #232 from benwa/patch-2Aldo Cortesi2014-03-101-6/+0
|\ \ \ | | | | | | | | Update layout.html
| * | | Update layout.htmlBennett Blodinger2014-03-081-6/+0
| |/ / | | | | | | Remove unnecessary menu button on mobile
* | | Merge pull request #233 from mitmproxy/untangle_circular_dependenciesAldo Cortesi2014-03-1023-668/+690
|\ \ \ | |/ / |/| / | |/ Untangle circular dependencies
| * fix mentions of CONTENT_MISSING in libmproxy.consoleMaximilian Hils2014-03-092-5/+7
| |
| * finish proxy.py split upMaximilian Hils2014-03-0922-288/+289
| |
| * split up proxy.pyMaximilian Hils2014-03-0913-188/+207
|/
* fix windows tests, include improvements from 0.10.1Maximilian Hils2014-03-084-5/+8
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-0815-227/+384
|\
| * Revert to old cert names, use a subdir for test conf dir.Aldo Cortesi2014-03-073-5/+5
| |
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-03-071-1/+0
| |\
| | * Merge pull request #230 from sergeychipiga/fix/remove-redundant-codelineMaximilian Hils2014-03-051-1/+0
| | |\ | | | | | | | | remove redundant codeline
| | | * remove redundant codelineSergey Chipiga2014-03-051-1/+0
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 22:18:01 +0000