Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'jason/ui' | Maximilian Hils | 2016-07-18 | 16 | -428/+568 |
|\ | |||||
| * | [web] update build | Jason | 2016-07-08 | 2 | -315/+315 |
| * | [web] add tests for main view and ui | Jason | 2016-07-08 | 3 | -39/+172 |
| * | [web] bug fixs | Jason | 2016-07-05 | 8 | -151/+88 |
| |\ | |||||
| | * | [web] set display large | Jason | 2016-07-05 | 5 | -76/+70 |
| | * | [web] listen to window.onKeyDown | Jason | 2016-07-05 | 5 | -75/+13 |
| * | | [web] bug fix | Jason | 2016-07-05 | 2 | -3/+3 |
| |/ | |||||
| * | [web] change ducks/ui | Jason | 2016-07-05 | 7 | -229/+278 |
| * | [web] ui ducks for content view | Jason | 2016-07-01 | 5 | -341/+362 |
* | | Merge pull request #1365 from Kriechi/fix-1333 | Maximilian Hils | 2016-07-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | add Windows py3 builds | Thomas Kriechbaumer | 2016-07-16 | 1 | -1/+1 |
* | | | Merge pull request #1378 from cortesi/cleanups | Aldo Cortesi | 2016-07-18 | 11 | -53/+56 |
|\ \ \ | |||||
| * | | | Console options cleanup | Aldo Cortesi | 2016-07-18 | 6 | -39/+22 |
| * | | | file -> open throughout console | Aldo Cortesi | 2016-07-18 | 3 | -3/+3 |
| * | | | Add a toggller helper to Options, start using it in mitmproxy console | Aldo Cortesi | 2016-07-18 | 7 | -11/+31 |
|/ / / | |||||
* | | | cleanup | Thomas Kriechbaumer | 2016-07-17 | 1 | -12/+12 |
* | | | http2: coverage++ | Thomas Kriechbaumer | 2016-07-17 | 2 | -96/+292 |
* | | | Merge pull request #1372 from cortesi/setheaders | Aldo Cortesi | 2016-07-17 | 11 | -133/+114 |
|\ \ \ | |||||
| * | | | setheaders -> addon | Aldo Cortesi | 2016-07-17 | 11 | -133/+114 |
|/ / / | |||||
* | | | Merge pull request #1371 from cortesi/cleancode | Aldo Cortesi | 2016-07-17 | 2 | -55/+2 |
|\ \ \ | |||||
| * | | | Remove old ReplaceHooks code | Aldo Cortesi | 2016-07-17 | 2 | -55/+2 |
|/ / / | |||||
* | | | Merge pull request #1370 from cortesi/filestreamer | Aldo Cortesi | 2016-07-17 | 4 | -16/+25 |
|\ \ \ | |||||
| * | | | Some work on stream-to-file | Aldo Cortesi | 2016-07-17 | 4 | -16/+25 |
* | | | | Merge pull request #1367 from Kriechi/fix-1366 | Aldo Cortesi | 2016-07-17 | 2 | -7/+24 |
|\ \ \ \ | |||||
| * | | | | fix-1366 | Thomas Kriechbaumer | 2016-07-16 | 2 | -7/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1369 from cortesi/dumper | Aldo Cortesi | 2016-07-17 | 6 | -301/+360 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Merge branch 'master' into dumper | Aldo Cortesi | 2016-07-17 | 6 | -33/+343 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1368 from DrakeCaraker/patch-1 | Aldo Cortesi | 2016-07-17 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update gamecenter.rst | Drake Caraker | 2016-07-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | @mhils can't merge | Maximilian Hils | 2016-07-16 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'duffer/tcpflow-filter' | Maximilian Hils | 2016-07-16 | 5 | -32/+342 |
|\ \ \ | |||||
| * | | | Allow DummyFlow to match ~e, ~src and ~dst | Shadab Zafar | 2016-07-16 | 3 | -18/+37 |
| * | | | Sort filt items alphabetically | Shadab Zafar | 2016-07-16 | 1 | -14/+14 |
| * | | | Add DummyFlow and its Tests | Shadab Zafar | 2016-07-16 | 1 | -1/+59 |
| * | | | Add tests for TCPFlow.match | Shadab Zafar | 2016-07-16 | 1 | -1/+15 |
| * | | | Add ~http and ~tcp filters | Shadab Zafar | 2016-07-16 | 2 | -1/+31 |
| * | | | Use ~bq / ~bs for messages sent from client / server | Shadab Zafar | 2016-07-16 | 2 | -19/+31 |
| * | | | Replace http decorator with one that handles different flowtypes | Shadab Zafar | 2016-07-16 | 1 | -20/+29 |
| * | | | Add TCPFlow.match | Shadab Zafar | 2016-07-16 | 1 | -0/+21 |
| * | | | Add tests for HTTPFlow only filters | Shadab Zafar | 2016-07-16 | 1 | -0/+50 |
| * | | | Add decorator for HTTPFlow filters | Shadab Zafar | 2016-07-16 | 1 | -0/+25 |
| * | | | Add test for operators (& | !) | Shadab Zafar | 2016-07-16 | 1 | -0/+25 |
| * | | | Add test for addresses (~src, ~dst) | Shadab Zafar | 2016-07-16 | 1 | -0/+16 |
| * | | | Add test for body (~b) | Shadab Zafar | 2016-07-16 | 2 | -6/+23 |
| * | | | Add test for error (~e) | Shadab Zafar | 2016-07-16 | 1 | -1/+16 |
| | * | | dumper: correctly detect request replay | Aldo Cortesi | 2016-07-17 | 1 | -2/+4 |
| | * | | The "handled" flag on responses should not persist across calls | Aldo Cortesi | 2016-07-17 | 1 | -0/+6 |
| | * | | Some mild refactoring of dumper.py | Aldo Cortesi | 2016-07-17 | 2 | -20/+47 |
| | * | | Extract console dump functionality into an addon | Aldo Cortesi | 2016-07-17 | 5 | -300/+324 |
| |/ / |/| | | |||||
* | | | Merge pull request #1306 from mitmproxy/message-body-encoding | Maximilian Hils | 2016-07-16 | 29 | -353/+644 |
|\ \ \ |