| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Py3: Use global next() instead of iterator method | Shadab Zafar | 2016-06-04 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | Fix Docstring: "inject" can be an action too | Shadab Zafar | 2016-06-04 | 1 | -2/+2 | |
| |/ / | ||||||
| * / | improve travis | Thomas Kriechbaumer | 2016-06-04 | 1 | -2/+3 | |
| |/ | ||||||
| * | web interleave old store and redux flow state | Maximilian Hils | 2016-06-04 | 4 | -10/+37 | |
| | | ||||||
| * | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-06-04 | 10 | -1105/+1191 | |
| |\ | ||||||
| | * | Basic ConsoleMaster tests, based on mastertester | Aldo Cortesi | 2016-06-04 | 2 | -6/+21 | |
| | | | ||||||
| | * | console/__init__.py -> console/master.py | Aldo Cortesi | 2016-06-04 | 4 | -808/+812 | |
| | | | ||||||
| | * | Very basic test truss for web.app | Aldo Cortesi | 2016-06-04 | 1 | -0/+22 | |
| | | | ||||||
| | * | Rebase on master | Aldo Cortesi | 2016-06-04 | 7 | -295/+343 | |
| | | | ||||||
| * | | web: implement update and remove for list and view | Maximilian Hils | 2016-06-04 | 5 | -36/+184 | |
| |/ | ||||||
| * | web: add flows to redux state | Maximilian Hils | 2016-06-03 | 6 | -38/+132 | |
| | | ||||||
| * | web: add redux list views | Maximilian Hils | 2016-06-03 | 4 | -83/+191 | |
| | | ||||||
| * | web: remove old event log store | Maximilian Hils | 2016-06-03 | 5 | -45/+7 | |
| | | ||||||
| * | web: implement redux store fetching | Maximilian Hils | 2016-06-03 | 9 | -73/+360 | |
| | | ||||||
| * | fix style | Thomas Kriechbaumer | 2016-06-03 | 1 | -0/+2 | |
| | | ||||||
| * | Merge branch 'redux-ducks' | Maximilian Hils | 2016-06-02 | 18 | -2533/+3953 | |
| |\ | ||||||
| | * | web: fix eventlog height registration | Maximilian Hils | 2016-06-02 | 2 | -22/+35 | |
| | | | ||||||
| | * | web: reduxify event log store | Maximilian Hils | 2016-06-02 | 11 | -205/+462 | |
| | | | ||||||
| | * | web: reduxify WebSocket | Maximilian Hils | 2016-06-02 | 7 | -71/+212 | |
| | | | ||||||
| | * | remove reducers directory | Maximilian Hils | 2016-06-02 | 1 | -8/+0 | |
| | | | ||||||
| | * | web: :hatching_chick: | Maximilian Hils | 2016-06-02 | 14 | -465/+344 | |
| | | | ||||||
| | * | use object spread operator | Maximilian Hils | 2016-06-02 | 3 | -4/+7 | |
| | | | | | | | | | | | While the spread operator is not part of ES6, React also uses it for JSX. It makes sense for us to keep it in other parts of the codebase as well. | |||||
| | * | add basic redux architecture, convert eventlog to redux | Maximilian Hils | 2016-06-02 | 9 | -812/+2258 | |
| | | | ||||||
| | * | add redux as dependency | Maximilian Hils | 2016-06-01 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge pull request #1190 from mitmproxy/file_menu_save_open | Maximilian Hils | 2016-06-02 | 7 | -1542/+2069 | |
| |\ \ | | | | | | | File menu save open | |||||
| | * | | final review done, nothing to change -> ready to merge | Clemens | 2016-06-02 | 2 | -1516/+1933 | |
| | | | | ||||||
| | * | | fix dumpfile upload | Maximilian Hils | 2016-06-02 | 3 | -19/+74 | |
| | | | | ||||||
| | * | | web: add fetchApi convenience method | Maximilian Hils | 2016-06-02 | 4 | -12/+18 | |
| | | | | ||||||
| | * | | change some pr issuses | Clemens | 2016-06-02 | 5 | -21/+26 | |
| | | | | ||||||
| | * | | basic file up and download working | Clemens | 2016-06-02 | 3 | -4/+14 | |
| | | | | ||||||
| | * | | basic file up and download working | Clemens | 2016-06-02 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | added basic file up_download functionality (not finish yet) | Clemens | 2016-06-02 | 4 | -18/+39 | |
| | | | | ||||||
| | * | | added ui | Clemens | 2016-06-02 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | Merge pull request #1167 from xntrik/mark_filter | Aldo Cortesi | 2016-06-03 | 3 | -0/+44 | |
| |\ \ \ | | | | | | | | | implement a toggle for viewing marked flows only in console | |||||
| | * | | | implement a toggle for viewing marked flows only in console | Christian Frichot | 2016-05-24 | 3 | -0/+44 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-06-03 | 18 | -618/+604 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #1202 from Lukasa/track-down-crypto-problems | Maximilian Hils | 2016-06-02 | 1 | -2/+3 | |
| | |\ \ \ \ | | | | | | | | | | | | | Better debugging output. | |||||
| | | * | | | | Quiet mode is a lie! | Cory Benfield | 2016-06-02 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | | * | | | | Better debugging output. | Cory Benfield | 2016-06-02 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #1192 from cortesi/testsuite | Aldo Cortesi | 2016-06-03 | 11 | -84/+152 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | WIP: Solidify pathod test suite | |||||
| | | * | | | | Bush-leage revert: re-enable brew OpenSSL update | Aldo Cortesi | 2016-06-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | More explicit name for the tcp.Server handler counter | Aldo Cortesi | 2016-06-03 | 2 | -4/+4 | |
| | | | | | | | ||||||
| | | * | | | | Try not updating OpenSSL for now | Aldo Cortesi | 2016-06-03 | 2 | -2/+2 | |
| | | | | | | | ||||||
| | | * | | | | Make dev.sh noisy to troubleshoot OpenSSL travis issue | Aldo Cortesi | 2016-06-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Make tcp.Client.connect return a context manager that closes the connection | Aldo Cortesi | 2016-06-03 | 3 | -19/+28 | |
| | | | | | | | ||||||
| | | * | | | | Pathod websocket service threads should not be immortal | Aldo Cortesi | 2016-06-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Implement a service connection handler counter, use it in Pathod test suite | Aldo Cortesi | 2016-06-03 | 3 | -7/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Lots of failures, but that's a good thing. | |||||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into testsuite | Aldo Cortesi | 2016-06-03 | 8 | -533/+452 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Satisfy linting gods | Aldo Cortesi | 2016-06-02 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Make last_log actually return last log | Aldo Cortesi | 2016-06-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |