Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2886 from tran-tien-dat/set-cookie | Aldo Cortesi | 2018-02-24 | 2 | -5/+30 |
|\ | |||||
| * | Fix #2829 | Tran Tien Dat | 2018-02-21 | 2 | -5/+30 |
* | | Merge pull request #2904 from cortesi/bump | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump version | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
* | | | Merge pull request #2903 from cortesi/3.0.2 | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
|\| | | |||||
| * | | Tag 3.0.2 | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
* | | | Merge pull request #2902 from cortesi/spawnfix | Aldo Cortesi | 2018-02-24 | 1 | -19/+28 |
|\ \ \ | |||||
| * | | | Fix loss of keyboard control after spawn | Aldo Cortesi | 2018-02-24 | 1 | -19/+28 |
| |/ / | |||||
* | | | bump version again | Maximilian Hils | 2018-02-23 | 1 | -1/+1 |
* | | | Merge pull request #2898 from yan12125/patch-1 | Maximilian Hils | 2018-02-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Explicitly declare pyperclip requirement | Chih-Hsuan Yen | 2018-02-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2897 from cortesi/point | Aldo Cortesi | 2018-02-23 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | Prep for v3.0.1 | Aldo Cortesi | 2018-02-23 | 2 | -1/+5 |
* | | | | Merge pull request #2896 from cortesi/cmdesc | Aldo Cortesi | 2018-02-23 | 2 | -3/+35 |
|\| | | | |/ / |/| | | |||||
| * | | Fix an issue with quoting and commands | Aldo Cortesi | 2018-02-23 | 2 | -3/+35 |
|/ / | |||||
* | | bump version | Maximilian Hils | 2018-02-22 | 1 | -1/+1 |
* | | update release instructions | Maximilian Hils | 2018-02-22 | 1 | -2/+3 |
* | | Merge pull request #2891 from cortesi/changelog | Maximilian Hils | 2018-02-22 | 1 | -8/+184 |
|\ \ | |||||
| * | | minor changelog improvements | Maximilian Hils | 2018-02-22 | 1 | -2/+2 |
| * | | Update changelog for 3.0 | Aldo Cortesi | 2018-02-22 | 1 | -8/+184 |
|/ / | |||||
* | | Merge pull request #2890 from mitmproxy/newdocs | Aldo Cortesi | 2018-02-22 | 181 | -3981/+12808 |
|\ \ | |||||
| * | | All new documentation | Aldo Cortesi | 2018-02-22 | 181 | -3981/+12808 |
|/ / | |||||
* | | Merge pull request #2888 from kajojify/issue-2885 | Maximilian Hils | 2018-02-22 | 1 | -0/+5 |
|\ \ | |/ |/| | |||||
| * | don't print message bodies when -v is passed. | Maximilian Hils | 2018-02-22 | 1 | -1/+1 |
| * | don't log for --commands or --options. | Maximilian Hils | 2018-02-22 | 1 | -1/+3 |
| * | Fix verbosity mode | Miroslav | 2018-02-21 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #2884 from kajojify/hotkeys-cleanup | Maximilian Hils | 2018-02-20 | 18 | -61/+1 |
|\ | |||||
| * | Flake, be happy | Miroslav | 2018-02-20 | 1 | -2/+0 |
| * | one more cleanup | Miroslav | 2018-02-20 | 1 | -1/+0 |
| * | Hotkeys cleanup | Miroslav | 2018-02-20 | 18 | -58/+1 |
* | | update log_events example documentation | Maximilian Hils | 2018-02-20 | 1 | -3/+1 |
* | | add documentation for custom_option.py | Maximilian Hils | 2018-02-20 | 1 | -0/+10 |
|/ | |||||
* | Merge pull request #2873 from kajojify/contentviews_items | Maximilian Hils | 2018-02-20 | 1 | -1/+2 |
|\ | |||||
| * | shlex.quote | Miroslav | 2018-02-19 | 1 | -1/+2 |
| * | quotes instead of join | Miroslav | 2018-02-19 | 1 | -3/+2 |
| * | Fix a bug with two-words contentview modes | Miroslav | 2018-02-19 | 1 | -1/+2 |
* | | Merge pull request #2881 from cortesi/refreshopt | Maximilian Hils | 2018-02-19 | 7 | -15/+15 |
|\ \ | |||||
| * | | option replay_kill_extra -> server_replay_kill_extra | Aldo Cortesi | 2018-02-20 | 7 | -8/+8 |
| * | | option refresh_server_playback -> server_replay_refresh | Aldo Cortesi | 2018-02-20 | 5 | -7/+7 |
* | | | Merge pull request #2878 from PaleNeutron/patch-1 | Maximilian Hils | 2018-02-19 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Remove heading_key of [script:n] | John Lyu | 2018-02-19 | 1 | -3/+1 |
|/ / | |||||
* | | Merge pull request #2757 from mhils/issue-2720 | Maximilian Hils | 2018-02-16 | 1 | -0/+1 |
|\ \ | |||||
| * | | add ctrl + right as an alias, fix #2720 | Maximilian Hils | 2018-02-16 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2870 from mhils/transparent-ipv6 | Maximilian Hils | 2018-02-16 | 1 | -6/+28 |
|\ \ | |||||
| * | | linux: support IPv6 destinations in transparent mode | Maximilian Hils | 2018-02-16 | 1 | -6/+28 |
|/ / | |||||
* | | Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docs | Maximilian Hils | 2018-02-13 | 1 | -1/+3 |
|\ \ | |||||
| * | | docs: don't set accept_redirects. | Maximilian Hils | 2018-02-13 | 1 | -2/+0 |
| * | | Modify Linux transparent proxy docs to include ipv6 configuration. | Aniket Panjwani | 2018-02-04 | 1 | -0/+4 |
* | | | Merge pull request #2858 from kajojify/revert_flow | Maximilian Hils | 2018-02-13 | 2 | -0/+5 |
|\ \ \ | |||||
| * | | | backup for flow.decode/encode | Miroslav | 2018-02-12 | 2 | -1/+4 |