Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Rip out master handler mechanism | Aldo Cortesi | 2017-03-17 | 1 | -1/+0 | |
|/ | ||||||
* | Merge pull request #2156 from syahn/pretty-popup | Maximilian Hils | 2017-03-16 | 1 | -0/+8 | |
|\ | ||||||
| * | Adjust pop-up docs position | Frank Ahn | 2017-03-15 | 1 | -0/+8 | |
* | | Merge pull request #2168 from cortesi/handlers | Maximilian Hils | 2017-03-16 | 27 | -444/+251 | |
|\ \ | ||||||
| * | | Rip out master handler mechanism | Aldo Cortesi | 2017-03-16 | 17 | -246/+116 | |
| * | | Remove last handlers in test suite | Aldo Cortesi | 2017-03-16 | 1 | -35/+21 | |
| * | | Remove test handlers by using taddons.RecordingMaster | Aldo Cortesi | 2017-03-16 | 13 | -120/+65 | |
| * | | Move mitmproxy console handlers to addon | Aldo Cortesi | 2017-03-16 | 1 | -32/+30 | |
| * | | Move dump handlers to addon | Aldo Cortesi | 2017-03-16 | 3 | -13/+21 | |
* | | | Merge pull request #2153 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-16 | 1 | -1/+34 | |
|\ \ \ | ||||||
| * | | | [web] Reach 100% coverage for ducks/ui/flow.js | Matthew Shao | 2017-03-15 | 1 | -1/+34 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2170 from felixonmars/patch-1 | Maximilian Hils | 2017-03-16 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix test_format_xml with dot in path | Felix Yan | 2017-03-16 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2172 from Kriechi/bump-h2 | Thomas Kriechbaumer | 2017-03-16 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | bump h2 and hyperframe | Thomas Kriechbaumer | 2017-03-16 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #2167 from mhils/update-dependencies | Aldo Cortesi | 2017-03-16 | 4 | -2/+7 | |
|\ \ | ||||||
| * | | update mypy | Maximilian Hils | 2017-03-15 | 4 | -2/+7 | |
* | | | Merge pull request #2166 from Kriechi/bump-sphinx | Aldo Cortesi | 2017-03-16 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | bump sphinx | Thomas Kriechbaumer | 2017-03-15 | 1 | -2/+2 | |
| |/ / | ||||||
* | | | Merge pull request #2152 from cortesi/readfile | Aldo Cortesi | 2017-03-16 | 35 | -212/+354 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add a light-weight custom event system, use it for keepserving | Aldo Cortesi | 2017-03-16 | 22 | -75/+102 | |
| * | | Clean up addonmanager interface | Aldo Cortesi | 2017-03-16 | 8 | -43/+46 | |
| * | | Extract flow reading into addons | Aldo Cortesi | 2017-03-15 | 13 | -123/+235 | |
| |/ | ||||||
* | | update release instructions | Thomas Kriechbaumer | 2017-03-15 | 1 | -10/+19 | |
* | | update release instructions | Thomas Kriechbaumer | 2017-03-15 | 1 | -2/+4 | |
* | | Merge pull request #2161 from mhils/make-request | Thomas Kriechbaumer | 2017-03-15 | 5 | -24/+84 | |
|\ \ | ||||||
| * | | add Request.make | Maximilian Hils | 2017-03-15 | 5 | -24/+84 | |
|/ / | ||||||
* | | Merge pull request #2159 from Kriechi/bump-pyparsing | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | bump pyparsing | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
* | | | Merge pull request #2155 from Kriechi/bump-cryptography | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | bump cryptography | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #2098 from iharsh234/bug-2086-2 | Aldo Cortesi | 2017-03-15 | 1 | -0/+2 | |
|\ \ | ||||||
| * | | Fix crash when duplicating flow | harsh vijay | 2017-03-13 | 1 | -2/+2 | |
| * | | Fix crash when duplicating flow (#2) | harsh vijay | 2017-03-13 | 1 | -1/+3 | |
* | | | Merge pull request #2147 from mhils/connection-ids | Aldo Cortesi | 2017-03-15 | 8 | -8/+93 | |
|\ \ \ | ||||||
| * | | | stateobject: automatically change id when copying | Maximilian Hils | 2017-03-14 | 5 | -16/+21 | |
| * | | | add connection ids | Maximilian Hils | 2017-03-14 | 5 | -2/+82 | |
|/ / / | ||||||
* | | | Merge pull request #2151 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-14 | 1 | -1/+3 | |
|\ \ \ | ||||||
| * | | | Update .travis.yml to fix the failure about yarn | Matthew Shao | 2017-03-14 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #2149 from mhils/multidictview-copy | Maximilian Hils | 2017-03-14 | 2 | -12/+24 | |
|\ \ \ | ||||||
| * | | | multidictviews should not be serializable | Maximilian Hils | 2017-03-14 | 1 | -12/+12 | |
| * | | | add MultiDictView.copy | Maximilian Hils | 2017-03-14 | 2 | -0/+12 | |
* | | | | Merge pull request #2145 from mhils/ne | Maximilian Hils | 2017-03-14 | 6 | -23/+1 | |
|\ \ \ \ | ||||||
| * | | | | py3: __ne__ delegates to __eq__ by default | Maximilian Hils | 2017-03-14 | 6 | -23/+1 | |
* | | | | | Merge pull request #2150 from dequis/pretty-host-filter | Maximilian Hils | 2017-03-14 | 2 | -3/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Match ~d and ~u filters against pretty_host too | dequis | 2017-03-14 | 2 | -3/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2142 from mhils/2140 | Aldo Cortesi | 2017-03-14 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix #2140 | Maximilian Hils | 2017-03-13 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2120 from ujjwal96/replace-from-file | Maximilian Hils | 2017-03-14 | 7 | -69/+66 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'origin/master' into pr-2120 | Maximilian Hils | 2017-03-12 | 33 | -689/+417 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | |