aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1436 from dufferzafar/jsbeautifierMaximilian Hils2016-07-289-1582/+13
|\
| * Use replace while decodingdufferzafar2016-07-281-2/+3
| * 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
| * Use jsbeautifier from pipdufferzafar2016-07-271-2/+2
* | 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
* | | add favicon to mitmweb (#1440)Clemens Brunner2016-07-272-1/+2
| |/ |/|
* | 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-251-2/+11
|\ \ \
| * | | Merge remote-tracking branch 'origin/master' into flow_editing_v2Maximilian Hils2016-07-2533-391/+442
| |\| |
| * | | minor fixesMaximilian Hils2016-07-251-8/+7
| * | | combine content with header updatesClemens2016-07-251-0/+5
| * | | added contentHashClemens2016-07-251-3/+8
* | | | make sure to escape errors printed to the consoleMaximilian Hils2016-07-251-1/+2
| |/ / |/| |
* | | Merge pull request #1425 from dufferzafar/clear-hotfixMaximilian Hils2016-07-241-1/+1
|\ \ \
| * | | Fix clearing of flowsShadab Zafar2016-07-251-1/+1
| | |/ | |/|
* / | console: fix options signalMaximilian Hils2016-07-242-2/+2
|/ /
* | Merge pull request #1423 from dufferzafar/fix-searchMaximilian Hils2016-07-241-2/+2
|\ \
| * | Fix console search on Python 3Shadab Zafar2016-07-241-2/+2
* | | fix keyboard navigationMaximilian Hils2016-07-241-1/+1
|/ /
* | fix #1373, fix #1154 (#1420)Maximilian Hils2016-07-232-140/+139
* | Merge pull request #1380 from dufferzafar/marked-filterMaximilian Hils2016-07-239-106/+94
|\ \
| * | Remove save marked flows promptShadab Zafar2016-07-232-13/+3
| * | Add marked attribute when converting flow to 0.18Shadab Zafar2016-07-231-0/+1
| * | Remove [Marked Flows] status indicatorShadab Zafar2016-07-231-4/+0
| * | Keep focus on same flow when disabling marked viewShadab Zafar2016-07-231-2/+14
| * | Focus nearest matching flow if current flow is unmarkedShadab Zafar2016-07-231-2/+23
| * | Move match function to FlowShadab Zafar2016-07-233-40/+20
| * | Keep focus on same flow when enabling marked viewShadab Zafar2016-07-231-5/+15
| * | Remove flow marking from ConsoleStateShadab Zafar2016-07-231-7/+0
| * | Use marked property in ConsoleState.clearShadab Zafar2016-07-231-6/+2
| * | Use ~marked filter while toggling marked viewShadab Zafar2016-07-231-24/+9
| * | Add a marked filterShadab Zafar2016-07-231-0/+9
| * | Update unmark all flows "U"Shadab Zafar2016-07-231-1/+1
| * | Update save_marked_flows to use the new attributeShadab Zafar2016-07-231-4/+1
| * | Fix display of mark status [m]Shadab Zafar2016-07-232-3/+2
| * | Update toggling of marked attribute on pressing "m"Shadab Zafar2016-07-231-4/+1
| * | Add marked attribute to flowShadab Zafar2016-07-231-1/+3
* | | Merge pull request #1416 from mhils/issue-1396Maximilian Hils2016-07-233-4/+8
|\ \ \
| * | | fix #1396, fix #1205, fix #1374Maximilian Hils2016-07-233-4/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 17:11:11 +0000