diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2020-04-08 20:21:12 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2020-04-08 20:21:12 +0200 |
| commit | 9d5305301a8e073cbb64bb6574e66bb34373935a (patch) | |
| tree | 7f30b0412a9974751846c757d44889694d00dc7b /web | |
| parent | 40925181e9d64c727f75e89acf0205bb4b87bb3a (diff) | |
| parent | 4d6886a0f4ebbf6bc66b74fa548ff724ba2ad660 (diff) | |
| download | mitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.tar.gz mitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.tar.bz2 mitmproxy-9d5305301a8e073cbb64bb6574e66bb34373935a.zip | |
Merge remote-tracking branch 'origin/master' into fix-ci
Diffstat (limited to 'web')
| -rw-r--r-- | web/README.md | 4 | ||||
| -rw-r--r-- | web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap | 2 | ||||
| -rw-r--r-- | web/src/js/components/Header/OptionMenu.jsx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/web/README.md b/web/README.md index c43d09f0..ae558bd6 100644 --- a/web/README.md +++ b/web/README.md @@ -1,6 +1,8 @@ # Quick Start +**Be sure to follow the Development Setup instructions found in the README.md, +and activate your virtualenv environment before proceeding.** - Run `yarn` to install dependencies -- Run `gulp` to start live-compilation. +- Run `yarn run gulp` to start live-compilation. - Run `mitmweb` and open http://localhost:8081/ diff --git a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap index 83d9355c..106f1732 100644 --- a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap +++ b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap @@ -76,7 +76,7 @@ exports[`OptionMenu Component should render correctly 1`] = ` onChange={[Function]} type="checkbox" /> - Verify server certificates + Don't verify server certificates </label> </div> </div> diff --git a/web/src/js/components/Header/OptionMenu.jsx b/web/src/js/components/Header/OptionMenu.jsx index 765129ed..4eb319ec 100644 --- a/web/src/js/components/Header/OptionMenu.jsx +++ b/web/src/js/components/Header/OptionMenu.jsx @@ -31,7 +31,7 @@ function OptionMenu({ openOptions }) { Use host header for display </SettingsToggle> <SettingsToggle setting="ssl_insecure"> - Verify server certificates + Don't verify server certificates </SettingsToggle> </div> <div className="menu-legend">Quick Options</div> |