aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 yarn
| * 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
|\ | | | | Add MultiDictView.copy()
| * 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 default
| * | 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 too
| * | | Match ~d and ~u filters against pretty_host toodequis2017-03-142-3/+7
|/ / / | | | | | | | | | | | | Changed the ~u filter in the console UI to match the behavior of mitmweb, which only matches against pretty_url, never against url.
* | | Merge pull request #2142 from mhils/2140Aldo Cortesi2017-03-141-1/+1
|\ \ \ | | | | | | | | Fix #2140
| * | | fix #2140Maximilian Hils2017-03-131-1/+1
| | | |
* | | | Merge pull request #2120 from ujjwal96/replace-from-fileMaximilian Hils2017-03-147-69/+66
|\ \ \ \ | |_|_|/ |/| | | Replace from file through replacement editor #1458
| * | | Merge remote-tracking branch 'origin/master' into pr-2120Maximilian Hils2017-03-1233-689/+417
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: test/mitmproxy/addons/test_replace.py
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | Custom options for addons
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | We also now ignore unknown options in config files by default, and print a warning if verbosity is incremented.
| * | | | Move serialization methods out of OptionsAldo Cortesi2017-03-144-94/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attributes on options share a namespace with options themselves. It's getting too crowded on our Options object, so let's shift some obvious stuff into the module.
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an options parameter to the start() event. This is to be used by addons on startup to add custom options. - Add a running() event that is called once the proxy is up and running. - With the new paradigm we can't log during master __init__, so add a tiny termstatus addon to print proxy status to terminal once we're running.
* | | | Merge pull request #2141 from mhils/decouple-file-format-versionMaximilian Hils2017-03-133-9/+34
|\ \ \ \ | | | | | | | | | | Decouple mitmproxy and file format version
| * | | | 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] Add tests for ducks/utils/store.js
| * | | [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 #2133
| * | [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 tmpdir
| * | 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] Fixes all existed tests
| * | [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
|\ \ | | | | | | Update proxyauth.py to add proxyauth metadata
| * | 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
|\ \ \ | | | | | | | | make websocket flows serializable
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 04:42:58 +0000