aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add gif parser and testsSachin Kelkar2017-02-0613-7/+304
* Merge pull request #1993 from Kriechi/coverage++Thomas Kriechbaumer2017-02-051-7/+0
|\
| * fix flaky testThomas Kriechbaumer2017-02-051-7/+0
|/
* Merge pull request #1989 from Kriechi/coverage++Maximilian Hils2017-02-0411-20/+30
|\
| * coverage++Thomas Kriechbaumer2017-02-0411-20/+30
* | Merge pull request #1988 from krsoninikhil/ordereddictMaximilian Hils2017-02-041-1/+1
|\ \ | |/ |/|
| * Changes view._store from dict to OrderedDictNikhil Soni2017-02-041-1/+1
* | Merge pull request #1967 from s4chin/remove-pillowMaximilian Hils2017-02-0312-1/+406
|\ \
| * | FeedbackSachin Kelkar2017-02-035-12/+28
| * | Fix and cleanupSachin Kelkar2017-02-033-93/+69
| * | Add iTXt and zTXt testsSachin Kelkar2017-02-034-19/+87
| * | Fix as per feedback and add more testsSachin Kelkar2017-02-0312-43/+74
| * | Add png parserSachin Kelkar2017-02-037-6/+320
* | | Merge pull request #1983 from Kriechi/coverage++Maximilian Hils2017-02-033-2/+24
|\ \ \ | |_|/ |/| |
| * | coverage++Thomas Kriechbaumer2017-02-033-2/+24
| |/
* | update installbuilderMaximilian Hils2017-02-031-2/+2
* | Merge pull request #1982 from ujjwal96/preserve-marked-flowsMaximilian Hils2017-02-033-0/+21
|\ \ | |/ |/|
| * Added testUjjwal Verma2017-02-031-0/+7
| * Closes #1960 'Z' removes unmarked flowsUjjwal Verma2017-02-032-0/+14
|/
* fix mergeThomas Kriechbaumer2017-02-023-10/+11
* Merge pull request #1979 from 0neblock/masterMaximilian Hils2017-02-021-1/+1
|\
| * Fixed following on flowlistAidan Cyr2017-02-021-1/+1
* | Merge pull request #1980 from Kriechi/improve-testsThomas Kriechbaumer2017-02-0259-620/+533
|\ \ | |/ |/|
| * adapt coverage checksThomas Kriechbaumer2017-02-022-8/+4
| * replace tutils.raises with pytest.raises + shimThomas Kriechbaumer2017-02-0252-516/+465
| * cleanup test utilsThomas Kriechbaumer2017-02-0211-99/+67
|/
* Merge pull request #1959 from Kriechi/coverage-failThomas Kriechbaumer2017-02-0216-23/+275
|\
| * add test coverage protectionThomas Kriechbaumer2017-02-025-6/+131
| * increase test coverageThomas Kriechbaumer2017-02-0211-17/+144
|/
* fix console testThomas Kriechbaumer2017-02-021-1/+1
* fix linting errorThomas Kriechbaumer2017-02-021-1/+0
* tests++ (#1976)Maximilian Hils2017-02-011-1/+9
* Add except clause to catch script parsing errors (#1929)lymanZerga112017-02-014-11/+23
* Merge pull request #1948 from amm0nite/fix_dns_spoofing_exampleMaximilian Hils2017-02-012-19/+54
|\
| * Better testAmmonite2017-01-311-1/+7
| * Add a test for the host replacementAmmonite2017-01-301-0/+16
| * Reset the host header to the correct destinationAmmonite2017-01-301-0/+1
| * Store original host in flow metadataAmmonite2017-01-291-7/+5
| * Fix host extractionAmmonite2017-01-221-1/+1
| * Follow PEP-8 and add commentAmmonite2017-01-221-5/+8
| * Add blank lines for lintAmmonite2017-01-211-0/+2
| * Change class nameAmmonite2017-01-201-2/+2
| * Get the the original header in requestheaders instead of requestAmmonite2017-01-201-19/+28
* | Merge pull request #1974 from cortesi/setheadersAldo Cortesi2017-02-016-93/+73
|\ \
| * | Regularise setheaders optionsAldo Cortesi2017-02-016-93/+73
* | | Merge pull request #1973 from cortesi/replaceAldo Cortesi2017-02-017-169/+159
|\| |
| * | Revamp replacement hooksAldo Cortesi2017-02-017-169/+159
|/ /
* | Merge pull request #1965 from cortesi/optnameAldo Cortesi2017-02-0113-179/+189
|\ \
| * | Consolidate option namesAldo Cortesi2017-01-3013-179/+189
* | | fully test addonmanager (#1970)Thomas Kriechbaumer2017-01-311-0/+12