aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* minor fixesMaximilian Hils2016-07-194-4/+5
* Merge pull request #1383 from cortesi/optionsAldo Cortesi2016-07-2021-287/+287
|\
| * mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> mitmproxy...Aldo Cortesi2016-07-2021-287/+287
|/
* Merge pull request #1382 from cortesi/cleanupAldo Cortesi2016-07-205-61/+72
|\
| * Merge branch 'master' into cleanupAldo Cortesi2016-07-1928-895/+800
| |\ | |/ |/|
* | web: fix flow selectionMaximilian Hils2016-07-192-2/+2
* | update web assetsMaximilian Hils2016-07-192-484/+472
* | simplify web ui ducksMaximilian Hils2016-07-1923-400/+316
* | fix web master options leftoversMaximilian Hils2016-07-192-7/+8
* | update README about Python supportThomas Kriechbaumer2016-07-191-3/+3
| * Test suite: get_proxy_config -> get_optionsAldo Cortesi2016-07-193-41/+57
| * Simplify common initilization in cmdline.pyAldo Cortesi2016-07-192-20/+15
|/
* Merge pull request #1379 from cortesi/proxyconfigAldo Cortesi2016-07-1926-534/+626
|\
| * Remove proxy.config.process_proxy_optionsAldo Cortesi2016-07-193-7/+3
| * ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.masterAldo Cortesi2016-07-194-59/+27
| * ProxyConf: auth_* into OptionsAldo Cortesi2016-07-197-61/+73
| * ProxyConfig: http2, rawtcp, no_upstream_cert -> OptionsAldo Cortesi2016-07-1910-27/+23
| * ProxyConfig: ciphers_client and ciphers_server -> OptionsAldo Cortesi2016-07-194-22/+21
| * ProxyConfig: Refactor to move verification mode checks into configureAldo Cortesi2016-07-192-24/+33
| * ProxyConfig: tcp_hosts and ignore_hosts to OptionsAldo Cortesi2016-07-193-9/+14
| * Regularize naming of upstream_trusted_ca* optionsAldo Cortesi2016-07-194-13/+11
| * ProxyConfig: various SSL options to OptionsAldo Cortesi2016-07-196-28/+33
| * Fix ca directory creationAldo Cortesi2016-07-191-4/+4
| * config.parse_server_spec shouldn't pass byts to tcp.AddressAldo Cortesi2016-07-193-7/+7
| * ProxyConfig: mode, upstream_server and upstream_auth to OptionsAldo Cortesi2016-07-1915-139/+173
| * Handle command-line argument errors properlyAldo Cortesi2016-07-192-29/+37
| * ProxyConfig: --body-size-limit to OptionsAldo Cortesi2016-07-197-23/+37
| * ProxyConfig: --cert to optionsAldo Cortesi2016-07-193-17/+30
| * Move clientcers & cadir to OptionsAldo Cortesi2016-07-195-25/+42
| * ProxyConfig: cadir to optionsAldo Cortesi2016-07-196-21/+19
| * ProxyConfig refactorAldo Cortesi2016-07-1910-74/+82
| * Unify proxy config and optionsAldo Cortesi2016-07-196-88/+100
|/
* web: remove SELECT_RELATIVEMaximilian Hils2016-07-183-23/+15
* Merge remote-tracking branch 'jason/ui'Maximilian Hils2016-07-1816-428/+568
|\
| * [web] update buildJason2016-07-082-315/+315
| * [web] add tests for main view and uiJason2016-07-083-39/+172
| * [web] bug fixsJason2016-07-058-151/+88
| |\
| | * [web] set display largeJason2016-07-055-76/+70
| | * [web] listen to window.onKeyDownJason2016-07-055-75/+13
| * | [web] bug fixJason2016-07-052-3/+3
| |/
| * [web] change ducks/uiJason2016-07-057-229/+278
| * [web] ui ducks for content viewJason2016-07-015-341/+362
* | Merge pull request #1365 from Kriechi/fix-1333Maximilian Hils2016-07-181-1/+1
|\ \
| * | add Windows py3 buildsThomas Kriechbaumer2016-07-161-1/+1
* | | Merge pull request #1378 from cortesi/cleanupsAldo Cortesi2016-07-1811-53/+56
|\ \ \
| * | | Console options cleanupAldo Cortesi2016-07-186-39/+22
| * | | file -> open throughout consoleAldo Cortesi2016-07-183-3/+3
| * | | Add a toggller helper to Options, start using it in mitmproxy consoleAldo Cortesi2016-07-187-11/+31
|/ / /
* | | cleanupThomas Kriechbaumer2016-07-171-12/+12
* | | http2: coverage++Thomas Kriechbaumer2016-07-172-96/+292
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 07:03:22 +0000