aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 03:47:08 +0000