aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Misc. typosluz.paz2018-02-2423-38/+38
| | | | | | | | | | | | | | Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt` Where whitelist contains: ``` cas doubleclick nd ot seeked statics te thru ```
* Merge pull request #2907 from cortesi/optionscompAldo Cortesi2018-02-2514-89/+70
|\ | | | | Start moving more complicated options over to /addons
| * addon options: proxyauth to /addonsAldo Cortesi2018-02-244-18/+20
| |
| * Split default_contentview into dumper_* and console_* varietiesAldo Cortesi2018-02-245-12/+15
| | | | | | | | | | Then move the new options into their respective addons. This was a shared option, and things are much much simpler if it isn't.
| * Move intercept options to addonAldo Cortesi2018-02-246-38/+15
| | | | | | | | | | | | | | As part of this, we zap an un-needed console command and use a boolean toggle setter instead. Also remove an ancient regression test that breaks encapsulation.
| * flow_detail option to /addons/dumperAldo Cortesi2018-02-244-21/+20
| |
* | Merge pull request #2880 from kira0204/update-readmeAldo Cortesi2018-02-251-0/+6
|\ \ | | | | | | Updating Readme for better testing
| * \ Merge branch 'master' of https://github.com/kira0204/mitmproxy into ↵kira02042018-02-24258-4409/+13438
| |\ \ | | | | | | | | | | | | update-readme
| * | | Better languagekira02042018-02-241-1/+1
| | | |
| * | | Extensive testingkira02042018-02-191-0/+6
| | | |
* | | | Merge pull request #2914 from kira0204/docs-2913Aldo Cortesi2018-02-251-4/+4
|\ \ \ \ | | | | | | | | | | Updating docs
| * | | | Fixing #2913kira02042018-02-241-4/+4
| | |/ / | |/| |
* | | | Merge pull request #2912 from smonami/patch-1Maximilian Hils2018-02-241-1/+1
|\ \ \ \ | |/ / / |/| | | Spelling corrected for think*
| * | | Spelling corrected for think*Monami Sharma2018-02-241-1/+1
|/ / / | | | | | | Replaced "You should thin* of the mitmproxy" to "You should think* of the mitmproxy"
* | | Merge pull request #2905 from cortesi/optsAldo Cortesi2018-02-2444-311/+313
|\ \ \ | | | | | | | | Start migrating addon options into /addons
| * \ \ Merge branch 'master' into optsAldo Cortesi2018-02-247-28/+98
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge pull request #2886 from tran-tien-dat/set-cookieAldo Cortesi2018-02-242-5/+30
|\ \ \ | | | | | | | | Parse Set-Cookie header more permissively. Fix #2829
| * | | Fix #2829Tran Tien Dat2018-02-212-5/+30
| | | |
* | | | Merge pull request #2904 from cortesi/bumpAldo Cortesi2018-02-241-1/+1
|\ \ \ \ | | | | | | | | | | Bump version
| * | | | Bump versionAldo Cortesi2018-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | Re-bump after tag
* | | | | Merge pull request #2903 from cortesi/3.0.2Aldo Cortesi2018-02-241-1/+1
|\| | | | | | | | | | | | | | Tag 3.0.2
| * | | | Tag 3.0.2Aldo Cortesi2018-02-241-1/+1
| | | | |
* | | | | Merge pull request #2902 from cortesi/spawnfixAldo Cortesi2018-02-241-19/+28
|\ \ \ \ \ | | | | | | | | | | | | Fix loss of keyboard control after spawn
| * | | | | Fix loss of keyboard control after spawnAldo Cortesi2018-02-241-19/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were stepping on this Urwid bug: https://github.com/urwid/urwid/issues/285 The guys from pazz/alot found a fix, which I cribbed: https://github.com/pazz/alot/pull/1204 Fix #2901
* | | | | bump version againMaximilian Hils2018-02-231-1/+1
| | | | | | | | | | | | | | | we may have to figure out something smarter here, maybe set the version for tagged commits to whatever the tag is.
* | | | | Merge pull request #2898 from yan12125/patch-1Maximilian Hils2018-02-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Explicitly declare pyperclip requirement
| * | | | | Explicitly declare pyperclip requirementChih-Hsuan Yen2018-02-241-1/+1
|/ / / / / | | | | | | | | | | pyperclip version 1.6.0 introduces an API change: the class `pyperclip.exceptions.PyperclipException` is moved to `pyperclip.PyperclipException`. As mitmproxy uses the latter, it's better to explicitly declare the requirement.
* | | | | Merge pull request #2897 from cortesi/pointAldo Cortesi2018-02-232-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Prep for v3.0.1
| * | | | | Prep for v3.0.1Aldo Cortesi2018-02-232-1/+5
| | | | | |
* | | | | | Merge pull request #2896 from cortesi/cmdescAldo Cortesi2018-02-232-3/+35
|\| | | | | | |/ / / / |/| | | | Fix an issue with quoting and commands
| * | | | Fix an issue with quoting and commandsAldo Cortesi2018-02-232-3/+35
|/ / / / | | | | | | | | | | | | | | | | Previously, quotes would disappear during editing, making it impossible to enter command arguments with spaces.
| | * | Resolve some left-over cross-addon dependenciesAldo Cortesi2018-02-242-6/+3
| | | |
| | * | addon options: upstream_authAldo Cortesi2018-02-243-18/+12
| | | | | | | | | | | | | | | | Also the last "easy" option to shift.
| | * | addon options: stickycookie, streambodiesAldo Cortesi2018-02-245-32/+34
| | | |
| | * | addon options: setheaders, stickyauthAldo Cortesi2018-02-248-35/+36
| | | |
| | * | addon options: readfile, save, scriptAldo Cortesi2018-02-245-27/+28
| | | |
| | * | addon options: migrate replace, simplify taddons.contextAldo Cortesi2018-02-244-17/+18
| | | |
| | * | addon options: shift server_replay optionsAldo Cortesi2018-02-243-79/+70
| | | |
| | * | addon options: shift keepserving and onboarding optionsAldo Cortesi2018-02-246-41/+43
| | | |
| | * | client options: migrate allowremote and clientplaybackAldo Cortesi2018-02-244-39/+38
| | | | | | | | | | | | | | | | | | | | Also triage options, and categorize them into core options (won't be migrated), options that are hard to migrate for various reasons, and easy migrations.
| | * | Clean up un-necessary arguments to taddons.contextAldo Cortesi2018-02-245-16/+15
| | | | | | | | | | | | | | | | Also test coverage ++
| | * | Add .pytest_cache to .gitignoreAldo Cortesi2018-02-241-0/+1
| | | |
| | * | Start moving addon options into /addonsAldo Cortesi2018-02-2410-26/+40
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | This takes the first few steps: - Extends taddons to make loading addon options easier - Removes dependencies in the test suite on options in addons - Tweaks command-line parser autocreation to ignore nonexistent options. This lets us load common options without over-depending on loaded addons.
* | | bump versionMaximilian Hils2018-02-221-1/+1
| | |
* | | update release instructionsMaximilian Hils2018-02-221-2/+3
| | |
* | | Merge pull request #2891 from cortesi/changelogMaximilian Hils2018-02-221-8/+184
|\ \ \ | | | | | | | | Update changelog for 3.0
| * | | minor changelog improvementsMaximilian Hils2018-02-221-2/+2
| | | |
| * | | Update changelog for 3.0Aldo Cortesi2018-02-221-8/+184
|/ / / | | | | | | | | | Fixes #2784
* | | Merge pull request #2890 from mitmproxy/newdocsAldo Cortesi2018-02-22181-3981/+12808
|\ \ \ | | | | | | | | All new documentation
| * | | All new documentationAldo Cortesi2018-02-22181-3981/+12808
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does a lot. - Ditch sphinx in favor of hugo. This gives us complete control of the layout and presentation of our docs. Henceforth, docs will be hosted on our website rather than ReadTheDocs. - Create a simple, clean doc layout and theme. - Remove large parts of the documentaion. I've ditched anything that was a) woefully out of date, b) too detailed, or c) too hard to maintain in the long term. - Huge updates to the docs themselves: completely rewrite addons documentation, add docs for core concepts like commands and options, and revise and tweak a lot of the existing docs. With this patch, we're also changing the way we publish and maintain the docs. From now on, we don't publish docs for every release. Instead, the website will contain ONE set of docs for each major release. The online docs will be updated if needed as minor releases are made. Docs are free to improve during minor releases, but anything that changes behaviour sufficiently to require a doc change warrants a new major release. This also leaves us free to progressively update and improve docs out of step with our release cadence. With this new scheme, I feel CI over the docs is less important. I've removed it for now, but won't object if someone wants to add it back in.