aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean up addonmanager interfaceAldo Cortesi2017-03-168-43/+46
* Extract flow reading into addonsAldo Cortesi2017-03-1513-123/+235
* Merge pull request #2098 from iharsh234/bug-2086-2Aldo Cortesi2017-03-151-0/+2
|\
| * Fix crash when duplicating flowharsh vijay2017-03-131-2/+2
| * Fix crash when duplicating flow (#2)harsh vijay2017-03-131-1/+3
* | Merge pull request #2147 from mhils/connection-idsAldo Cortesi2017-03-158-8/+93
|\ \
| * | stateobject: automatically change id when copyingMaximilian Hils2017-03-145-16/+21
| * | add connection idsMaximilian Hils2017-03-145-2/+82
|/ /
* | Merge pull request #2151 from MatthewShao/jest-devMaximilian Hils2017-03-141-1/+3
|\ \
| * | Update .travis.yml to fix the failure about yarnMatthew Shao2017-03-141-1/+3
|/ /
* | Merge pull request #2149 from mhils/multidictview-copyMaximilian Hils2017-03-142-12/+24
|\ \
| * | multidictviews should not be serializableMaximilian Hils2017-03-141-12/+12
| * | add MultiDictView.copyMaximilian Hils2017-03-142-0/+12
* | | Merge pull request #2145 from mhils/neMaximilian Hils2017-03-146-23/+1
|\ \ \
| * | | py3: __ne__ delegates to __eq__ by defaultMaximilian Hils2017-03-146-23/+1
* | | | Merge pull request #2150 from dequis/pretty-host-filterMaximilian Hils2017-03-142-3/+7
|\ \ \ \
| * | | | Match ~d and ~u filters against pretty_host toodequis2017-03-142-3/+7
|/ / / /
* | | | Merge pull request #2142 from mhils/2140Aldo Cortesi2017-03-141-1/+1
|\ \ \ \
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 03:41:12 +0000