aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* moved editor to raw_view modeClemens2016-07-214-41/+39
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-07-2110-274/+276
|\
| * Merge pull request #1385 from mitmproxy/consoleAldo Cortesi2016-07-213-9/+7
| |\ | | | | | | console: nopop, rheaders into Options
| | * console: nopop, rheaders into OptionsAldo Cortesi2016-07-213-9/+7
| |/
| * console: share one ActionBar instanceAldo Cortesi2016-07-213-4/+4
| | | | | | | | | | This fixes an issues where popping a view off the stack caused stale ActionBar contents to be displayed.
| * Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into ↵Aldo Cortesi2016-07-215-260/+248
| |\ | | | | | | | | | dufferzafar-flow-export
| | * Fix hotkey kerfuffleShadab Zafar2016-07-202-12/+12
| | | | | | | | | | | | | | | | | | `z` (instead of `C`) to "clear flow list or eventlog" `C` to "export flow to clipboard" `E` to "export flow to file"
| | * Make necessary changes in flowviewShadab Zafar2016-07-201-23/+28
| | |
| | * Refactor exportersShadab Zafar2016-07-203-25/+18
| | |
| | * Add a url exporterShadab Zafar2016-07-202-0/+10
| | |
| | * Ask for scope when called from flowlistShadab Zafar2016-07-202-63/+80
| | |
| | * Integrate ask_copy_part into exportersShadab Zafar2016-07-203-27/+23
| | | | | | | | | | | | This introduces some duplication but that'll be refactored later.
| | * Remove raw_request exporterShadab Zafar2016-07-202-42/+0
| | | | | | | | | | | | This functionality will be handled by headers+content
| | * s/part/keyShadab Zafar2016-07-202-27/+22
| | |
| | * Don't send master and state parametersShadab Zafar2016-07-202-8/+8
| | |
| | * RefactorShadab Zafar2016-07-201-111/+112
| | |
| | * Common function for both file and clipboardShadab Zafar2016-07-202-18/+22
| | |
| | * Export to file (p) or clipboard (P)Shadab Zafar2016-07-203-13/+24
| | |
| | * Exporters listShadab Zafar2016-07-203-16/+14
| | |
| * | Fix netlib.utils.is_valid_hostAldo Cortesi2016-07-213-2/+18
| |/ | | | | | | | | | | | | | | - Don't crash when passed an empty string. This translated into an actual core crash, discovered while fuzzing with afl. - Taking a slice of length one out of bytes returns an integer, so the check for trailing period in this function never worked on Python3. - Add unit tests.
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 17:14:29 +0000