Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-01 11:41:54 +00:00
Code Issues Projects Releases Wiki Activity
7,548 Commits 1 Branch 67 Tags 50 MiB
760882a3d1
Commit Graph

7548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldo Cortesi
6f2f34981a Tag 3.0.2 2018-02-24 09:53:45 +13:00
Aldo Cortesi
252e50d88b
Merge pull request #2902 from cortesi/spawnfix 
Fix loss of keyboard control after spawn
 2018-02-24 09:52:12 +13:00
Aldo Cortesi
dde71ffff7 Fix loss of keyboard control after spawn 
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
 2018-02-24 09:18:08 +13:00
ColdFire
8008e25527
Merge branch 'master' into issue-2872 2018-02-23 23:25:14 +05:30
Maximilian Hils
18384eecbd
bump version again 
we may have to figure out something smarter here, maybe set the version for tagged commits to whatever the tag is.
 2018-02-23 18:14:02 +01:00
Maximilian Hils
f119fd23f8
Merge pull request #2898 from yan12125/patch-1 
Explicitly declare pyperclip requirement
 2018-02-23 17:50:55 +01:00
Chih-Hsuan Yen
d1ecf9df94
Explicitly declare pyperclip requirement 
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.
 2018-02-24 00:26:49 +08:00
Aldo Cortesi
8ef2539426
Merge pull request #2897 from cortesi/point 
Prep for v3.0.1
 2018-02-23 14:32:21 +13:00
Aldo Cortesi
3c7f41dee6 Prep for v3.0.1 2018-02-23 14:25:34 +13:00
Aldo Cortesi
06807414c1
Merge pull request #2896 from cortesi/cmdesc 
Fix an issue with quoting and commands
 2018-02-23 13:32:44 +13:00
Aldo Cortesi
c471c42c7c Fix an issue with quoting and commands 
Previously, quotes would disappear during editing, making it
impossible to enter command arguments with spaces.
 2018-02-23 13:04:31 +13:00
ColdFire
777cb98a86
Merge branch 'master' into issue-2872 2018-02-23 00:27:10 +05:30
Maximilian Hils
58ccad7576
bump version 2018-02-22 14:44:10 +01:00
Maximilian Hils
a9d5757da0
update release instructions 2018-02-22 14:21:46 +01:00
Maximilian Hils
4356430aa3
Merge pull request #2891 from cortesi/changelog 
Update changelog for 3.0
 2018-02-22 13:17:33 +01:00
Maximilian Hils
ef30360481
minor changelog improvements 2018-02-22 12:42:02 +01:00
Aldo Cortesi
7cb6937f03 Update changelog for 3.0 
Fixes #2784
 2018-02-22 20:53:43 +13:00
Aldo Cortesi
443409e32b
Merge pull request #2890 from mitmproxy/newdocs 
All new documentation
 2018-02-22 20:48:17 +13:00
Aldo Cortesi
982508d30f All new documentation 
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.
 2018-02-22 18:07:58 +13:00
Maximilian Hils
1cacefa104
Merge pull request #2888 from kajojify/issue-2885 
Fix verbosity mode. Fix #2885
 2018-02-22 01:35:57 +01:00
Maximilian Hils
1cc5f30b2d
don't print message bodies when -v is passed. 
In contrast to headers, they will almost never help uncover issues.
 2018-02-22 00:22:14 +01:00
Maximilian Hils
4ce8d6ca37
don't log for --commands or --options. 2018-02-22 00:20:34 +01:00
Miroslav
2edaca9141 Fix verbosity mode 2018-02-21 22:12:22 +02:00
Tran Tien Dat
97e534e76b Fix #2829 2018-02-21 19:58:29 +08:00
Maximilian Hils
95c160ac13
Merge pull request #2884 from kajojify/hotkeys-cleanup 
Hotkeys cleanup. #2877
 2018-02-20 21:45:48 +01:00
Miroslav
34dbd9adbb Flake, be happy 2018-02-20 21:45:14 +02:00
Miroslav
6c525317cc one more cleanup 2018-02-20 20:14:36 +02:00
Maximilian Hils
3934dbb5ad
update log_events example documentation 2018-02-20 17:15:35 +01:00
Maximilian Hils
29ef663aa1
add documentation for custom_option.py 2018-02-20 17:14:21 +01:00
Miroslav
aea6fd28c8 Hotkeys cleanup 2018-02-20 16:25:39 +02:00
Maximilian Hils
1d23d50a9d
Merge pull request #2873 from kajojify/contentviews_items 
Fix a bug with two-words contentview modes
 2018-02-20 01:54:27 +01:00
Maximilian Hils
da4c1ee625
Merge pull request #2881 from cortesi/refreshopt 
option refresh_server_playback -> server_replay_refresh
 2018-02-19 22:52:19 +01:00
Miroslav
d6d2f55a4f shlex.quote 2018-02-19 23:50:46 +02:00
Miroslav
4e03326ec5 quotes instead of join 2018-02-19 23:31:26 +02:00
Aldo Cortesi
e9bdada1f5 option replay_kill_extra -> server_replay_kill_extra 
Continuing effort to collect all sever replay options under a commmon prefix.
 2018-02-20 09:46:47 +13:00
Aldo Cortesi
8129b93bb0 option refresh_server_playback -> server_replay_refresh 
All other server playback options have this form.
 2018-02-20 09:30:29 +13:00
kira0204
d045f879ac Extensive testing 2018-02-19 22:56:52 +05:30
kira0204
fb54bb3777 Testing 2018-02-19 22:45:30 +05:30
Maximilian Hils
a9402975dc
Merge pull request #2878 from PaleNeutron/patch-1 
Remove heading_key of [script:n]
 2018-02-19 15:47:39 +01:00
John Lyu
e467c01afe
Remove heading_key of [script:n] 2018-02-19 22:25:13 +08:00
kira0204
a519afb9c9 Fixing getter 2018-02-19 11:10:19 +05:30
Fenil Gandhi
6bf250aa3e Fixed a bug with bytes encoding error 2018-02-19 09:40:12 +05:30
Miroslav
e2b7abb898 Fix a bug with two-words contentview modes 2018-02-19 00:14:42 +02:00
Maximilian Hils
93425d4b1a
Merge pull request #2757 from mhils/issue-2720 
Add alternative keybindings for changing the layout pane on WSL (#2720)
 2018-02-16 23:22:56 +01:00
Maximilian Hils
11c739fe18 add ctrl + right as an alias, fix #2720 2018-02-16 22:22:39 +01:00
kira0204
60cd8cb0b1 Adding test 2018-02-16 22:30:29 +05:30
Maximilian Hils
04c3079aa2
Merge pull request #2870 from mhils/transparent-ipv6 
Linux: support IPv6 destinations in transparent mode
 2018-02-16 16:21:07 +01:00
Maximilian Hils
9e86764ce3 linux: support IPv6 destinations in transparent mode 
This fixes #2869 with the help of @aniketpanjwani.
 2018-02-16 15:36:21 +01:00
kira0204
e82641ee2d fix 2794 2018-02-15 08:40:54 +05:30
Maximilian Hils
baf4b5dc03
Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docs 
Modify Linux transparent proxy docs to include ipv6 configuration.
 2018-02-13 20:21:40 +01:00