aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [web] bug fixsJason2016-07-058-151/+88
| |\ \
| | * | [web] set display largeJason2016-07-055-76/+70
| | | |
| | * | [web] listen to window.onKeyDownJason2016-07-055-75/+13
| | | |
| * | | [web] bug fixJason2016-07-052-3/+3
| |/ /
| * | [web] change ducks/uiJason2016-07-057-229/+278
| | |
| * | [web] ui ducks for content viewJason2016-07-015-341/+362
| | |
* | | Merge pull request #1365 from Kriechi/fix-1333Maximilian Hils2016-07-181-1/+1
|\ \ \ | | | | | | | | add Windows py3 builds
| * | | add Windows py3 buildsThomas Kriechbaumer2016-07-161-1/+1
| | | | | | | | | | | | | | | | fixes #1333
* | | | Merge pull request #1378 from cortesi/cleanupsAldo Cortesi2016-07-1811-53/+56
|\ \ \ \ | | | | | | | | | | Console-related cleanups
| * | | | Console options cleanupAldo Cortesi2016-07-186-39/+22
| | | | | | | | | | | | | | | | | | | | Use setters, use togglers, move more things out of master
| * | | | file -> open throughout consoleAldo Cortesi2016-07-183-3/+3
| | | | |
| * | | | Add a toggller helper to Options, start using it in mitmproxy consoleAldo Cortesi2016-07-187-11/+31
|/ / / /
* | | | cleanupThomas Kriechbaumer2016-07-171-12/+12
| | | |
* | | | http2: coverage++Thomas Kriechbaumer2016-07-172-96/+292
| | | |
* | | | Merge pull request #1372 from cortesi/setheadersAldo Cortesi2016-07-1711-133/+114
|\ \ \ \ | | | | | | | | | | setheaders -> addon
| * | | | setheaders -> addonAldo Cortesi2016-07-1711-133/+114
|/ / / /
* | | | Merge pull request #1371 from cortesi/cleancodeAldo Cortesi2016-07-172-55/+2
|\ \ \ \ | | | | | | | | | | Remove old ReplaceHooks code
| * | | | Remove old ReplaceHooks codeAldo Cortesi2016-07-172-55/+2
|/ / / /
* | | | Merge pull request #1370 from cortesi/filestreamerAldo Cortesi2016-07-174-16/+25
|\ \ \ \ | | | | | | | | | | Some work on stream-to-file
| * | | | Some work on stream-to-fileAldo Cortesi2016-07-174-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | - stream -> filestreamer throughout - move active_flows set into FileStreamer addon
* | | | | Merge pull request #1367 from Kriechi/fix-1366Aldo Cortesi2016-07-172-7/+24
|\ \ \ \ \ | | | | | | | | | | | | fix-1366
| * | | | | fix-1366Thomas Kriechbaumer2016-07-162-7/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #1369 from cortesi/dumperAldo Cortesi2016-07-176-301/+360
|\ \ \ \ \ | |_|/ / / |/| | | | Extract console dump functionality into an addon
| * | | | Merge branch 'master' into dumperAldo Cortesi2016-07-176-33/+343
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1368 from DrakeCaraker/patch-1Aldo Cortesi2016-07-171-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Update gamecenter.rst
| * | | | Update gamecenter.rstDrake Caraker2016-07-161-1/+1
|/ / / / | | | | | | | | Typo fix: changed plist score value from '0' to '55', aligning with the subsequent explanatory text.
* | | | @mhils can't mergeMaximilian Hils2016-07-161-1/+1
| | | |
* | | | Merge remote-tracking branch 'duffer/tcpflow-filter'Maximilian Hils2016-07-165-32/+342
|\ \ \ \
| * | | | Allow DummyFlow to match ~e, ~src and ~dstShadab Zafar2016-07-163-18/+37
| | | | |
| * | | | Sort filt items alphabeticallyShadab Zafar2016-07-161-14/+14
| | | | |
| * | | | Add DummyFlow and its TestsShadab Zafar2016-07-161-1/+59
| | | | |
| * | | | Add tests for TCPFlow.matchShadab Zafar2016-07-161-1/+15
| | | | |
| * | | | Add ~http and ~tcp filtersShadab Zafar2016-07-162-1/+31
| | | | |
| * | | | Use ~bq / ~bs for messages sent from client / serverShadab Zafar2016-07-162-19/+31
| | | | |
| * | | | Replace http decorator with one that handles different flowtypesShadab Zafar2016-07-161-20/+29
| | | | |
| * | | | Add TCPFlow.matchShadab Zafar2016-07-161-0/+21
| | | | |
| * | | | Add tests for HTTPFlow only filtersShadab Zafar2016-07-161-0/+50
| | | | |
| * | | | Add decorator for HTTPFlow filtersShadab Zafar2016-07-161-0/+25
| | | | |
| * | | | Add test for operators (& | !)Shadab Zafar2016-07-161-0/+25
| | | | |
| * | | | Add test for addresses (~src, ~dst)Shadab Zafar2016-07-161-0/+16
| | | | |
| * | | | Add test for body (~b)Shadab Zafar2016-07-162-6/+23
| | | | |
| * | | | Add test for error (~e)Shadab Zafar2016-07-161-1/+16
| | | | |
| | * | | dumper: correctly detect request replayAldo Cortesi2016-07-171-2/+4
| | | | | | | | | | | | | | | | | | | | Fixes #1361
| | * | | The "handled" flag on responses should not persist across callsAldo Cortesi2016-07-171-0/+6
| | | | |
| | * | | Some mild refactoring of dumper.pyAldo Cortesi2016-07-172-20/+47
| | | | |
| | * | | Extract console dump functionality into an addonAldo Cortesi2016-07-175-300/+324
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes all the code that deals with printing flows to screen from dump.py into a self-contained addon. - This fixes a bug - by moving dumping into an addon, we now dump flows AFTER addon transformation, so we can see the changes made. - We get dumping "for free" in other places by simply adding the addon. It's now easy to add dumping to console to mitmweb for debugging and development. The same goes for external projects that derive from master. - We also get major benefits in clarity for a frankly hairy part of our project. Mitmdump is much clearer, and all the hairyness is now isolated for further refactoring.
* | | | Merge pull request #1306 from mitmproxy/message-body-encodingMaximilian Hils2016-07-1629-353/+644
|\ \ \ \ | | | | | | | | | | Improve Message Body Encoding
| * | | | preserve content-type parameter orderMaximilian Hils2016-07-152-2/+5
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into message-body-encodingMaximilian Hils2016-07-15162-2901/+3176
| |\| | |
| * | | | improve message content semanticsMaximilian Hils2016-07-1510-130/+194
| | | | |