aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add escape_single_quotes=False arg to bytes_to_escaped_strMaximilian Hils2016-07-294-7/+12
* minor fixesMaximilian Hils2016-07-293-6/+6
* clean up release tool, build linux binariesMaximilian Hils2016-07-294-188/+168
* Merge pull request #1436 from dufferzafar/jsbeautifierMaximilian Hils2016-07-2811-1586/+20
|\
| * Use replace while decodingdufferzafar2016-07-282-5/+8
| * Set upper bound on jsbeautifier package to 1.7dufferzafar2016-07-281-1/+1
| * Use strutils.native before sending data to jsbeautifierdufferzafar2016-07-271-1/+1
| * Re-order imports etc.dufferzafar2016-07-271-17/+11
| * Remove jsbeautifier filesdufferzafar2016-07-278-1564/+0
| * Make contentview requirements mandatorydufferzafar2016-07-271-2/+2
| * Use jsbeautifier from pipdufferzafar2016-07-272-2/+3
* | minor fixesMaximilian Hils2016-07-272-3/+4
* | Merge pull request #1446 from cortesi/stateAldo Cortesi2016-07-282-1/+18
|\ \
| * | console: add replace_view_state, fix statusbar issuesAldo Cortesi2016-07-282-1/+18
* | | Merge pull request #1442 from cortesi/scriptsAldo Cortesi2016-07-281-0/+1
|\| |
| * | mitmdump: send script .done when terminating after flow readAldo Cortesi2016-07-281-0/+1
* | | Merge pull request #1406 from gzzhanghao/fix36Maximilian Hils2016-07-277-19/+52
|\ \ \
| * | | [web] change test filesJason2016-07-278-7/+1
| * | | [web] bug fix and add testJason2016-07-264-13/+37
| * | | [web] fix: Flow update changes list order #36Jason2016-07-241-10/+25
* | | | add favicon to mitmweb (#1440)Clemens Brunner2016-07-274-2/+4
| |_|/ |/| |
* | | update dependencies (#1435)Maximilian Hils2016-07-253-5/+5
* | | restrict accepted lxml versions to fix buildsMaximilian Hils2016-07-251-1/+1
* | | fix #1432Maximilian Hils2016-07-251-2/+8
* | | Merge pull request #1428 from dufferzafar/replayAldo Cortesi2016-07-262-22/+33
|\ \ \ | |_|/ |/| |
| * | Consolidate replay under RShadab Zafar2016-07-252-22/+33
* | | Merge pull request #1427 from mhils/grideditorAldo Cortesi2016-07-269-728/+884
|\ \ \
| * | | py2: silence abc metaclass warningsMaximilian Hils2016-07-241-3/+1
| * | | refactor grideditor for py3 compatibilityMaximilian Hils2016-07-249-728/+886
* | | | Merge branch 'flow_editing_v2'Maximilian Hils2016-07-2519-202/+305
|\ \ \ \
| * | | | add up/download button to ContentTooLarge viewMaximilian Hils2016-07-251-4/+14
| * | | | simplify stop editMaximilian Hils2016-07-253-19/+22
| * | | | fix flow editMaximilian Hils2016-07-253-16/+26
| * | | | Merge remote-tracking branch 'jason/style' into flow_editing_v2Maximilian Hils2016-07-252-2/+12
| |\ \ \ \
| | * | | | [web] style improvementJason2016-07-242-2/+12
| | | |_|/ | | |/| |
| * | | | make empty buttons editableMaximilian Hils2016-07-253-9/+12
| * | | | web: refactor ContentLoaderMaximilian Hils2016-07-259-120/+164
| * | | | Merge remote-tracking branch 'origin/master' into flow_editing_v2Maximilian Hils2016-07-2573-741/+933
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | 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
* | | | | make sure to escape errors printed to the consoleMaximilian Hils2016-07-251-1/+2
| |/ / / |/| | |
* | | | Merge pull request #1426 from mhils/query-encodingMaximilian Hils2016-07-244-21/+94
|\ \ \ \
| * | | | add quote/unquote testsMaximilian Hils2016-07-241-2/+42