aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Merge pull request #2888 from kajojify/issue-2885Maximilian Hils2018-02-221-0/+5
|\ | | | | Fix verbosity mode. Fix #2885
| * don't print message bodies when -v is passed.Maximilian Hils2018-02-221-1/+1
| | | | | | In contrast to headers, they will almost never help uncover issues.
| * don't log for --commands or --options.Maximilian Hils2018-02-221-1/+3
| |
| * Fix verbosity modeMiroslav2018-02-211-1/+4
|/
* Merge pull request #2884 from kajojify/hotkeys-cleanupMaximilian Hils2018-02-2018-61/+1
|\ | | | | Hotkeys cleanup. #2877
| * Flake, be happyMiroslav2018-02-201-2/+0
| |
| * one more cleanupMiroslav2018-02-201-1/+0
| |
| * Hotkeys cleanupMiroslav2018-02-2018-58/+1
| |
* | update log_events example documentationMaximilian Hils2018-02-201-3/+1
| |
* | add documentation for custom_option.pyMaximilian Hils2018-02-201-0/+10
|/
* Merge pull request #2873 from kajojify/contentviews_itemsMaximilian Hils2018-02-201-1/+2
|\ | | | | Fix a bug with two-words contentview modes
| * shlex.quoteMiroslav2018-02-191-1/+2
| |
| * quotes instead of joinMiroslav2018-02-191-3/+2
| |
| * Fix a bug with two-words contentview modesMiroslav2018-02-191-1/+2
| |
* | Merge pull request #2881 from cortesi/refreshoptMaximilian Hils2018-02-197-15/+15
|\ \ | | | | | | option refresh_server_playback -> server_replay_refresh
| * | option replay_kill_extra -> server_replay_kill_extraAldo Cortesi2018-02-207-8/+8
| | | | | | | | | | | | Continuing effort to collect all sever replay options under a commmon prefix.
| * | option refresh_server_playback -> server_replay_refreshAldo Cortesi2018-02-205-7/+7
| | | | | | | | | | | | All other server playback options have this form.
* | | Merge pull request #2878 from PaleNeutron/patch-1Maximilian Hils2018-02-191-3/+1
|\ \ \ | |_|/ |/| | Remove heading_key of [script:n]
| * | Remove heading_key of [script:n]John Lyu2018-02-191-3/+1
|/ /
* | Merge pull request #2757 from mhils/issue-2720Maximilian Hils2018-02-161-0/+1
|\ \ | | | | | | Add alternative keybindings for changing the layout pane on WSL (#2720)
| * | add ctrl + right as an alias, fix #2720Maximilian Hils2018-02-161-0/+1
|/ /
* | Merge pull request #2870 from mhils/transparent-ipv6Maximilian Hils2018-02-161-6/+28
|\ \ | | | | | | Linux: support IPv6 destinations in transparent mode
| * | linux: support IPv6 destinations in transparent modeMaximilian Hils2018-02-161-6/+28
|/ / | | | | | | This fixes #2869 with the help of @aniketpanjwani.
* | Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docsMaximilian Hils2018-02-131-1/+3
|\ \ | | | | | | Modify Linux transparent proxy docs to include ipv6 configuration.
| * | docs: don't set accept_redirects.Maximilian Hils2018-02-131-2/+0
| | | | | | | | | | | | | | | | | | it's not really clear why we are even doing this, so let's just remove it entirely and see what happens. Discussion: https://github.com/mitmproxy/mitmproxy/pull/2841#discussion_r165928492
| * | Modify Linux transparent proxy docs to include ipv6 configuration.Aniket Panjwani2018-02-041-0/+4
| | |
* | | Merge pull request #2858 from kajojify/revert_flowMaximilian Hils2018-02-132-0/+5
|\ \ \ | | | | | | | | Fix reverting of a flow
| * | | backup for flow.decode/encodeMiroslav2018-02-122-1/+4
| | | |
| * | | Fix reverting of a flowMiroslav2018-02-102-0/+2
| | | |
* | | | Merge pull request #2863 from mitmproxy/requires-io-masterMaximilian Hils2018-02-131-1/+1
|\ \ \ \ | | | | | | | | | | [requires.io] dependency update on master branch
| * | | | [requires.io] dependency updaterequires.io2018-02-121-1/+1
| | | | |
* | | | | Merge pull request #2847 from kira0204/key-cookie-issueMaximilian Hils2018-02-123-34/+49
|\ \ \ \ \ | |/ / / / |/| | | | Handling empty key with value for cookies, fix #2827
| * | | | keeping consistency, better testingkira02042018-02-113-36/+47
| | | | |