aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* web: implement update and remove for list and viewMaximilian Hils2016-06-045-36/+184
* web: add flows to redux stateMaximilian Hils2016-06-036-38/+132
* web: add redux list viewsMaximilian Hils2016-06-034-83/+191
* web: remove old event log storeMaximilian Hils2016-06-035-45/+7
* web: implement redux store fetchingMaximilian Hils2016-06-039-73/+360
* fix styleThomas Kriechbaumer2016-06-031-0/+2
* Merge branch 'redux-ducks'Maximilian Hils2016-06-0218-2533/+3953
|\
| * web: fix eventlog height registrationMaximilian Hils2016-06-022-22/+35
| * web: reduxify event log storeMaximilian Hils2016-06-0211-205/+462
| * web: reduxify WebSocketMaximilian Hils2016-06-027-71/+212
| * remove reducers directoryMaximilian Hils2016-06-021-8/+0
| * web: :hatching_chick:Maximilian Hils2016-06-0214-465/+344
| * use object spread operatorMaximilian Hils2016-06-023-4/+7
| * add basic redux architecture, convert eventlog to reduxMaximilian Hils2016-06-029-812/+2258
| * add redux as dependencyMaximilian Hils2016-06-011-0/+2
* | Merge pull request #1190 from mitmproxy/file_menu_save_openMaximilian Hils2016-06-027-1542/+2069
|\ \
| * | final review done, nothing to change -> ready to mergeClemens2016-06-022-1516/+1933
| * | fix dumpfile uploadMaximilian Hils2016-06-023-19/+74
| * | web: add fetchApi convenience methodMaximilian Hils2016-06-024-12/+18
| * | change some pr issusesClemens2016-06-025-21/+26
| * | basic file up and download workingClemens2016-06-023-4/+14
| * | basic file up and download workingClemens2016-06-021-1/+2
| * | added basic file up_download functionality (not finish yet)Clemens2016-06-024-18/+39
| * | added uiClemens2016-06-021-0/+12
* | | Merge pull request #1167 from xntrik/mark_filterAldo Cortesi2016-06-033-0/+44
|\ \ \
| * | | implement a toggle for viewing marked flows only in consoleChristian Frichot2016-05-243-0/+44
* | | | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-0318-618/+604
|\ \ \ \
| * \ \ \ Merge pull request #1202 from Lukasa/track-down-crypto-problemsMaximilian Hils2016-06-021-2/+3
| |\ \ \ \
| | * | | | Quiet mode is a lie!Cory Benfield2016-06-021-2/+2
| | * | | | Better debugging output.Cory Benfield2016-06-021-0/+1
| * | | | | Merge pull request #1192 from cortesi/testsuiteAldo Cortesi2016-06-0311-84/+152
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bush-leage revert: re-enable brew OpenSSL updateAldo Cortesi2016-06-031-1/+1
| | * | | | More explicit name for the tcp.Server handler counterAldo Cortesi2016-06-032-4/+4
| | * | | | Try not updating OpenSSL for nowAldo Cortesi2016-06-032-2/+2
| | * | | | Make dev.sh noisy to troubleshoot OpenSSL travis issueAldo Cortesi2016-06-031-1/+1
| | * | | | Make tcp.Client.connect return a context manager that closes the connectionAldo Cortesi2016-06-033-19/+28
| | * | | | Pathod websocket service threads should not be immortalAldo Cortesi2016-06-031-1/+1
| | * | | | Implement a service connection handler counter, use it in Pathod test suiteAldo Cortesi2016-06-033-7/+44
| | * | | | Merge remote-tracking branch 'upstream/master' into testsuiteAldo Cortesi2016-06-038-533/+452
| | |\ \ \ \
| | * | | | | Satisfy linting godsAldo Cortesi2016-06-021-1/+2
| | * | | | | Make last_log actually return last logAldo Cortesi2016-06-021-1/+1
| | * | | | | Silence requests warningsAldo Cortesi2016-06-021-0/+3
| | * | | | | Reimplement test retrievals on pathoc and ditch requestsAldo Cortesi2016-06-023-11/+27
| | * | | | | pathod.test shouldn't use the API at allAldo Cortesi2016-06-022-15/+5
| | * | | | | Since we have locks over the logs, use direct access rather than API requests...Aldo Cortesi2016-06-023-10/+7
| | * | | | | Bump error timeoutAldo Cortesi2016-06-021-1/+1
| | * | | | | Remove debug printAldo Cortesi2016-06-021-1/+0
| | * | | | | Add expect_log to the pathod test truss, and use it for last_logAldo Cortesi2016-06-021-1/+15
| | * | | | | Formatting of READMEAldo Cortesi2016-06-021-16/+22
| | * | | | | Fix lock over pathod locksAldo Cortesi2016-06-021-8/+10