| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #2259 from mhils/2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 | |
| |\ \ \ | |_|/ |/| | | ||||||
| | * | | fix #2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 | |
| | |/ | ||||||
| * / | clarify that `--cert` expects a leaf certificate | Maximilian Hils | 2017-04-26 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #2262 from Kriechi/reduced-coverage++ | Aldo Cortesi | 2017-04-26 | 11 | -18/+16 | |
| |\ | ||||||
| | * | improve tests | Thomas Kriechbaumer | 2017-04-25 | 11 | -18/+16 | |
| * | | Merge pull request #2264 from cortesi/options | Aldo Cortesi | 2017-04-26 | 44 | -518/+413 | |
| |\ \ | ||||||
| | * | | configure(options, updated) -> configure(updated) | Aldo Cortesi | 2017-04-26 | 29 | -102/+99 | |
| | * | | Move options into ctx | Aldo Cortesi | 2017-04-26 | 17 | -235/+199 | |
| | * | | Remove watchdog, solidify script testing | Aldo Cortesi | 2017-04-26 | 9 | -184/+118 | |
| * | | | Merge pull request #2261 from cortesi/addonrevamp | Aldo Cortesi | 2017-04-26 | 34 | -533/+448 | |
| |\| | | ||||||
| | * | | Revamp how addons work | Aldo Cortesi | 2017-04-25 | 34 | -533/+448 | |
| | |/ | ||||||
| * | | Merge pull request #2219 from MatthewShao/jest-dev | Maximilian Hils | 2017-04-25 | 4 | -52/+245 | |
| |\ \ | |/ |/| | ||||||
| | * | Fix the tests for flows actions. | Matthew Shao | 2017-04-25 | 2 | -169/+31 | |
| | * | Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest... | Matthew Shao | 2017-04-25 | 27 | -101/+368 | |
| | |\ | ||||||
| | | * | simplify selectRelative, add example for action testing | Maximilian Hils | 2017-04-24 | 4 | -98/+120 | |
| | | * | [web] Coverage++ for ducks/flows.js | Matthew Shao | 2017-04-24 | 1 | -3/+158 | |
| | |/ |/| | ||||||
| * | | Merge pull request #2256 from ujjwal96/ip-formatting | Thomas Kriechbaumer | 2017-04-22 | 2 | -3/+4 | |
| |\ \ | ||||||
| | * | | Fixed formatting in mitmdump | Ujjwal Verma | 2017-04-22 | 2 | -3/+4 | |
| |/ / | ||||||
| * | | [requires.io] dependency update on master branch (#2252) | Maximilian Hils | 2017-04-20 | 1 | -1/+1 | |
| * | | [requires.io] dependency update on master branch (#2241) | Maximilian Hils | 2017-04-17 | 1 | -2/+2 | |
| * | | Merge pull request #2240 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2017-04-16 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Update setup.py | Maximilian Hils | 2017-04-16 | 1 | -1/+1 | |
| | * | | [requires.io] dependency update | requires.io | 2017-04-16 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #2239 from Kriechi/update-kaitai | Maximilian Hils | 2017-04-16 | 10 | -28/+69 | |
| |\ \ | ||||||
| | * | | manually fix imports | Thomas Kriechbaumer | 2017-04-16 | 2 | -7/+5 | |
| | * | | update kaitai and recompile formats | Thomas Kriechbaumer | 2017-04-16 | 10 | -31/+74 | |
| |/ / | ||||||
| * | | Merge pull request #2234 from ujjwal96/ip-formatting | Maximilian Hils | 2017-04-10 | 5 | -6/+32 | |
| |\ \ | ||||||
| | * | | Fixes #2109 | Ujjwal Verma | 2017-04-09 | 5 | -6/+32 | |
| |/ / | ||||||
| * | | Merge pull request #2232 from r1b/master | Maximilian Hils | 2017-04-09 | 2 | -1/+4 | |
| |\ \ | ||||||
| | * | | fixes ipv6 authority form parsing in CONNECT | Robert C Jensen | 2017-04-07 | 2 | -1/+4 | |
| |/ / | ||||||
| * | | Merge pull request #2227 from vinaydargar/grammarphrasing | Maximilian Hils | 2017-04-04 | 2 | -2/+2 | |
| |\ \ | ||||||
| | * | | Replace phrase 'the the' in 2 places | Vinay Dargar | 2017-04-02 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #2224 from jonathanrfisher1/patch-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -4/+4 | |
| |\ \ | ||||||
| | * | | Replace phrase "an TLS" with "a TLS" | jonathanrfisher1 | 2017-03-29 | 1 | -4/+4 | |
| |/ / | ||||||
| * | | Merge pull request #2223 from krsoninikhil/empty-logbuffer | Thomas Kriechbaumer | 2017-03-29 | 1 | -0/+16 | |
| |\ \ | ||||||
| | * | | Add tests for set_focus | Nikhil Soni | 2017-03-29 | 1 | -0/+16 | |
| * | | | Merge pull request #2222 from BasThomas/patch-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -6/+6 | |
| |\ \ \ | ||||||
| | * | | | Add syntax highlighting to Readme | Bas Broek | 2017-03-29 | 1 | -6/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #2220 from krsoninikhil/empty-logbuffer | Thomas Kriechbaumer | 2017-03-28 | 1 | -0/+4 | |
| |\| | | ||||||
| | * | | Override set_focus to check for index error | Nikhil Soni | 2017-03-29 | 1 | -0/+4 | |
| |/ / | ||||||
| | * | [web] Coverage++ for ducks/flows.js | Matthew Shao | 2017-03-28 | 1 | -3/+158 | |
| |/ | ||||||
| * | Merge pull request #2212 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-27 | 3 | -2/+35 | |
| |\ | ||||||
| | * | [web] Minor fixes for the test. | Matthew Shao | 2017-03-26 | 2 | -7/+10 | |
| | * | [web] Exclude src/js/filt/filt.js from coverage report. | Matthew Shao | 2017-03-26 | 1 | -1/+4 | |
| | * | [web] Add JS coverage to codecov. | Matthew Shao | 2017-03-26 | 2 | -3/+7 | |
| | * | [web] Reach 100% coverage for ducks/settings.js | Matthew Shao | 2017-03-26 | 1 | -0/+23 | |
| * | | Merge pull request #2215 from mitmproxy/proxapp.local-1 | Maximilian Hils | 2017-03-26 | 1 | -2/+2 | |
| |\ \ | ||||||
| | * | | proxapp -> proxapp.local | Maximilian Hils | 2017-03-26 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #2213 from Kriechi/concurrent-coverage | Maximilian Hils | 2017-03-25 | 1 | -4/+4 | |
| |\ \ | |/ |/| | ||||||
| | * | fix #2201 | Thomas Kriechbaumer | 2017-03-25 | 1 | -4/+4 | |
| |/ | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |