aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix #1396, fix #1205, fix #1374Maximilian Hils2016-07-233-4/+8
|
* improve dumper addon text alignment (#1415)Maximilian Hils2016-07-234-37/+54
|
* http2: fix kill (#1413)Thomas Kriechbaumer2016-07-231-0/+2
|
* http2: cleanup testsThomas Kriechbaumer2016-07-231-37/+38
|
* re-enable OSX builds on travis (#1411)Maximilian Hils2016-07-221-4/+4
|
* Merge pull request #1412 from cortesi/updatedAldo Cortesi2016-07-2332-134/+154
|\ | | | | Addon iface: .configure(options) -> .configure(options, updated)
| * Addon iface: .configure(options) -> .configure(options, updated)Aldo Cortesi2016-07-2332-134/+154
|/
* Merge pull request #1410 from cortesi/addonsAldo Cortesi2016-07-237-70/+136
|\ | | | | Keep maturing scripts and addons
| * scripts: refactor some examples that keep global stateAldo Cortesi2016-07-233-39/+43
| | | | | | | | We now have a better way to do this.
| * script: convert test recorder to an addon classAldo Cortesi2016-07-232-19/+19
| |
| * scripts: .start can now return an Addon instanceAldo Cortesi2016-07-233-2/+39
| |
| * script: tune auto reloadAldo Cortesi2016-07-231-2/+12
| | | | | | | | | | | | | | | | | | - Don't respond to directory changes - Ignore hidden files I've "solved" this as well as it can be done in modd, and getting good results here just turns into a large pile of heuristics that don't work in all circumstances. Also watchdog sucks.
| * script: add a namespace adaptor to match AddonsAldo Cortesi2016-07-232-11/+26
|/
* fix mitmproxy 0.11 dumpfile - was 0.18 beforeMaximilian Hils2016-07-221-0/+0
|
* Merge pull request #1399 from mhils/fix-cv-cache-invalidationMaximilian Hils2016-07-215-18/+26
|\ | | | | Fix content view cache invalidation
| * fix content view cache invalidationMaximilian Hils2016-07-215-18/+26
| |
* | Merge pull request #1400 from mhils/fix-copy-clipboardMaximilian Hils2016-07-211-5/+8
|\ \ | |/ |/| py3: fix copy to clipboard
| * py3: fix copy to clipboardMaximilian Hils2016-07-211-5/+8
|/
* Merge pull request #1397 from mhils/console-fixesMaximilian Hils2016-07-215-24/+14
|\ | | | | Console fixes
| * minor fixesMaximilian Hils2016-07-212-14/+1
| |
| * improve console ux for duplication/creationMaximilian Hils2016-07-212-2/+5
| |
| * fix #1391Maximilian Hils2016-07-211-3/+3
| |
| * fix #1392Maximilian Hils2016-07-211-2/+2
| |
| * fix #1390Maximilian Hils2016-07-211-3/+3
|/
* display python version in console helpMaximilian Hils2016-07-211-1/+3
|
* web: perf++Maximilian Hils2016-07-213-5/+23
|
* 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
| |\