aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | fix #2140Maximilian Hils2017-03-131-1/+1
* | | | | | Merge pull request #2120 from ujjwal96/replace-from-fileMaximilian Hils2017-03-147-69/+66
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into pr-2120Maximilian Hils2017-03-1233-689/+417
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | replacements: error right away when file does not existMaximilian Hils2017-03-122-28/+34
| * | | | | minor fixesMaximilian Hils2017-03-123-32/+30
| * | | | | Removed ReplaceBaseUjjwal Verma2017-03-121-5/+2
| * | | | | minor fixesMaximilian Hils2017-03-111-4/+3
| * | | | | Changed docsUjjwal Verma2017-03-111-4/+4
| * | | | | Fixed Replacement testUjjwal Verma2017-03-093-6/+6
| * | | | | Removed replace-from-file option.Made requested changesUjjwal Verma2017-03-095-22/+15
* | | | | | Merge pull request #2129 from cortesi/addonoptsAldo Cortesi2017-03-1435-204/+321
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move running() in to .tick() method to make sure it's called consistentlyAldo Cortesi2017-03-141-4/+4
| * | | | | Enable custom options in config filesAldo Cortesi2017-03-144-23/+45
| * | | | | Move serialization methods out of OptionsAldo Cortesi2017-03-144-94/+100
| * | | | | Optmanager: handle unknown options in value setsAldo Cortesi2017-03-143-1/+6
| * | | | | Show custom addon options in --options outputAldo Cortesi2017-03-144-8/+9
| * | | | | Enable custom options for addonsAldo Cortesi2017-03-1432-87/+170
|/ / / / /
* | | | | Merge pull request #2141 from mhils/decouple-file-format-versionMaximilian Hils2017-03-133-9/+34
|\ \ \ \ \
| * | | | | decouple mitmproxy and file format versionMaximilian Hils2017-03-133-9/+34
| | |_|/ / | |/| | |
* | | | | Merge pull request #2137 from MatthewShao/jest-devMaximilian Hils2017-03-131-0/+86
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [web] Improve the code style on testsMatthew Shao2017-03-131-36/+45
| * | | | [web] Add tests for ducks/utils/store.jsMatthew Shao2017-03-131-0/+77
| | |/ / | |/| |
* | | | Merge pull request #2138 from MatthewShao/fix#2133Maximilian Hils2017-03-131-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | [web] Fixes the flaw in #2133Matthew Shao2017-03-131-4/+4
|/ / /
* | | Merge pull request #2136 from Kriechi/nuke-custom-tmpdirThomas Kriechbaumer2017-03-1213-346/+274
|\ \ \ | |_|/ |/| |
| * | nuke tutils.tmpdir, use pytest tmpdirThomas Kriechbaumer2017-03-1213-346/+274
|/ /
* | Merge pull request #2133 from MatthewShao/jest-devMaximilian Hils2017-03-114-11/+11
|\ \
| * | [web] remove node tests on travisMatthew Shao2017-03-111-3/+0
| * | [web] Fixes all existed testsMatthew Shao2017-03-112-5/+7
| * | [web] Fixes stopEdit action in ducks/ui/flow.jsMatthew Shao2017-03-111-3/+4
|/ /
* | Merge pull request #2118 from lymanZerga11/patch-3Maximilian Hils2017-03-112-3/+5
|\ \
| * | fix type hintsMaximilian Hils2017-03-101-2/+2
| * | add testslymanZerga112017-03-091-1/+1
| * | Add testslymanZerga112017-03-091-0/+1
| * | add type hintsMaximilian Hils2017-03-081-2/+2
| * | Update proxyauth.pylymanZerga112017-03-081-1/+1
| * | Update proxyauth.pylymanZerga112017-03-081-2/+3
* | | Merge pull request #2114 from mitmproxy/fix-websocket-serializationThomas Kriechbaumer2017-03-107-32/+71
|\ \ \
| * | | use flow.id to link websocket + handshake flowsThomas Kriechbaumer2017-03-101-1/+2
| * | | make websocket flows serializableThomas Kriechbaumer2017-03-097-31/+69
| | |/ | |/|
* | | Merge pull request #2128 from Kriechi/disable-more-h2cThomas Kriechbaumer2017-03-105-40/+82
|\ \ \
| * | | disable h2c prior knowledge connectionsThomas Kriechbaumer2017-03-105-40/+82
| |/ /
* | | Merge pull request #2131 from MatthewShao/jest-devMaximilian Hils2017-03-103-287/+0
|\ \ \ | |/ / |/| |
| * | [web] remove the tests for abandoned files.Matthew Shao2017-03-103-287/+0
|/ /
* | Merge pull request #2100 from cortesi/optionsAldo Cortesi2017-03-0952-1459/+1334
|\ \
| * | Send change event when options are resetAldo Cortesi2017-03-091-0/+1
| * | Merge remote-tracking branch 'upstream/master' into optionsAldo Cortesi2017-03-094-3/+29
| |\ \ | |/ / |/| |
* | | Merge pull request #2124 from mitmproxy/opensuse-docsMaximilian Hils2017-03-081-0/+14
|\ \ \
| * | | add install docs for openSUSEMaximilian Hils2017-03-081-0/+14
* | | | Merge pull request #2121 from mitmproxy/address-leftoversMaximilian Hils2017-03-081-1/+1
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:58:42 +0000