Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | 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 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | 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 | |
| | * | | | | 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 | |
| | * | | | | | Silence requests warnings | Aldo Cortesi | 2016-06-02 | 1 | -0/+3 | |
| | * | | | | | Reimplement test retrievals on pathoc and ditch requests | Aldo Cortesi | 2016-06-02 | 3 | -11/+27 | |
| | * | | | | | pathod.test shouldn't use the API at all | Aldo Cortesi | 2016-06-02 | 2 | -15/+5 | |
| | * | | | | | Since we have locks over the logs, use direct access rather than API requests... | Aldo Cortesi | 2016-06-02 | 3 | -10/+7 | |
| | * | | | | | Bump error timeout | Aldo Cortesi | 2016-06-02 | 1 | -1/+1 | |
| | * | | | | | Remove debug print | Aldo Cortesi | 2016-06-02 | 1 | -1/+0 | |
| | * | | | | | Add expect_log to the pathod test truss, and use it for last_log | Aldo Cortesi | 2016-06-02 | 1 | -1/+15 | |
| | * | | | | | Formatting of README | Aldo Cortesi | 2016-06-02 | 1 | -16/+22 | |
| | * | | | | | Fix lock over pathod locks | Aldo Cortesi | 2016-06-02 | 1 | -8/+10 | |
| | * | | | | | Honesty in testing | Aldo Cortesi | 2016-06-02 | 2 | -7/+1 | |
| * | | | | | | slightly improve readme wording | Maximilian Hils | 2016-06-02 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #1199 from dufferzafar/pathod-generator-hotfix | Thomas Kriechbaumer | 2016-06-02 | 1 | -0/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Handle the slice object case in TransformGenerator.__getitem__ | Shadab Zafar | 2016-06-03 | 1 | -0/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1198 from s4chin/add-install-instructions | Thomas Kriechbaumer | 2016-06-02 | 1 | -0/+7 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | Update README | Sachin Kelkar | 2016-06-02 | 1 | -0/+7 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | web: use object spread operator | Maximilian Hils | 2016-06-02 | 3 | -501/+399 | |
| * | | | | please flake8 | Maximilian Hils | 2016-06-02 | 1 | -1/+1 | |
| * | | | | Merge remote-tracking branch 'duffer/pathod-lang-generators' | Maximilian Hils | 2016-06-02 | 3 | -31/+41 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Simplify rand_byte by creating a special case for Python 2 | Shadab Zafar | 2016-06-02 | 1 | -1/+5 | |
| | * | | | Enable Travis for test_language_generators | Shadab Zafar | 2016-06-02 | 1 | -2/+2 | |
| | * | | | Remove redundant __getslice__ from TransformGenerator | Shadab Zafar | 2016-06-02 | 1 | -4/+0 | |
| | * | | | Py3: Return bytes from FileGenerator | Shadab Zafar | 2016-06-02 | 2 | -9/+11 | |
| | * | | | Py3: Return bytes from RandomGenerator | Shadab Zafar | 2016-06-02 | 2 | -16/+24 | |
* | | | | | Fix flow handling for mitmdump | Aldo Cortesi | 2016-06-03 | 1 | -5/+3 | |
|/ / / / | ||||||
* | / / | Move the admonision to use Discourse in the issue template to the bottom | Aldo Cortesi | 2016-06-02 | 1 | -1/+3 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1191 from cortesi/utils | Aldo Cortesi | 2016-06-02 | 23 | -298/+281 | |
|\ \ \ | ||||||
| * | | | Shift a bunch more string-related functions to strutils | Aldo Cortesi | 2016-06-02 | 9 | -87/+82 |