aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* web: fix ValueEditor, clean up codeMaximilian Hils2016-07-2127-747/+657
|
* web: fix flow content updateMaximilian Hils2016-07-211-13/+6
|
* Merge remote-tracking branch 'origin/flow_editing'Maximilian Hils2016-07-2015-32/+241
|\
| * added flow_content updateClemens2016-07-194-50/+98
| |
| * Merge remote-tracking branch 'origin/master' into flow_editingClemens2016-07-19197-4960/+5992
| |\
| * | moved flow editor state to reduxClemens2016-07-199-58/+118
| | |
| * | added new btn, changed to codemirrorClemens2016-07-157-40/+51
| | |
| * | change way to editClemens2016-07-149-89/+130
| | |
| * | chaged editor styleClemens2016-07-131-2/+2
| | |
| * | gzip issueClemens2016-07-131-0/+1
| | |
| * | make file out ouf string to combine flow content updates via editor and ↵Clemens2016-07-132-4/+3
| | | | | | | | | | | | fileupload
| * | added code editor and file uploadClemens2016-07-139-56/+115
| | |
| * | modify flow contentClemens2016-07-117-12/+61
| | |
* | | minor fixesMaximilian Hils2016-07-194-4/+5
| | |
* | | Merge pull request #1383 from cortesi/optionsAldo Cortesi2016-07-2021-287/+287
|\ \ \ | | | | | | | | mitmproxy.flow.options -> mitmproxy.options
| * | | mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> ↵Aldo Cortesi2016-07-2021-287/+287
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | mitmproxy.options It might be slightly more felicitous to move optmanager into netlib at some point, especially if we can also use it in pathod. This also consolidates our constants in mitmproxy.options, removing some duplicates.
* | | Merge pull request #1382 from cortesi/cleanupAldo Cortesi2016-07-205-61/+72
|\ \ \ | |_|/ |/| | [wip] ProxyConf-related refactoring
| * | 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
|\ \ | | | | | | Unify ProxyConfig and Options
| * | 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
| | | | | | | | | | | | At some point we stopped handling exceptions from get_common_options properly.
| * | ProxyConfig: --body-size-limit to OptionsAldo Cortesi2016-07-197-23/+37
| | |
| * | ProxyConfig: --cert to optionsAldo Cortesi2016-07-193-17/+30
| | | | | | | | | | | | Also incidentally improve handling of invalid certificate formats.
| * | Move clientcers & cadir to OptionsAldo Cortesi2016-07-195-25/+42
| | | | | | | | | | | | | | | Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change event.
| * | ProxyConfig: cadir to optionsAldo Cortesi2016-07-196-21/+19
| | |
| * | ProxyConfig refactorAldo Cortesi2016-07-1910-74/+82
| | | | | | | | | | | | | | | Step two of frog boiling: move listening address and port into options. This is the hard bit, because it touches the test suite so deeply.
| * | Unify proxy config and optionsAldo Cortesi2016-07-196-88/+100
|/ / | | | | | | | | This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig with an Options object.
* | 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
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 01:09:37 +0000