aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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)Aldo Cortesi2016-07-2332-134/+154
| |/ /
| * | Merge pull request #1410 from cortesi/addonsAldo Cortesi2016-07-237-70/+136
| |\ \
| | * | scripts: refactor some examples that keep global stateAldo Cortesi2016-07-233-39/+43
| | * | 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
| | * | 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 invalidationMaximilian Hils2016-07-215-18/+26
| * | Merge pull request #1400 from mhils/fix-copy-clipboardMaximilian Hils2016-07-211-5/+8
| |\ \ | | |/ | |/|
| | * py3: fix copy to clipboardMaximilian Hils2016-07-211-5/+8
| |/
| * Merge pull request #1397 from mhils/console-fixesMaximilian Hils2016-07-215-24/+14
| |\
| | * 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
* | minor fixesMaximilian Hils2016-07-251-8/+7
* | rewrite getDiffClemens2016-07-251-6/+5
* | remove auto change to raw mode on editClemens2016-07-253-4/+3
* | combine content with header updatesClemens2016-07-252-9/+5
* | added contentHashClemens2016-07-253-6/+10
* | remove lastFileUpload fieldClemens2016-07-255-24/+10
* | file upload updates contentview, editable contentloader, diffs on uploadClemens2016-07-228-47/+65
* | moved editor to raw_view mode, add content_file_uploadClemens2016-07-216-25/+50
* | 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 OptionsAldo Cortesi2016-07-213-9/+7
| |/
| * console: share one ActionBar instanceAldo Cortesi2016-07-213-4/+4
| * Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into d...Aldo Cortesi2016-07-215-260/+248
| |\
| | * Fix hotkey kerfuffleShadab Zafar2016-07-202-12/+12
| | * 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
| | * Remove raw_request exporterShadab Zafar2016-07-202-42/+0
| | * 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