Commit Graph

7462 Commits

Author SHA1 Message Date
Aldo Cortesi
0d43bb550a
Merge pull request #2914 from kira0204/docs-2913
Updating docs
2018-02-25 10:09:45 +13:00
kira0204
f31ce49aa5 Fixing #2913 2018-02-24 23:47:55 +05:30
Maximilian Hils
6c72166573
Merge pull request #2912 from smonami/patch-1
Spelling corrected for think*
2018-02-24 18:32:17 +01:00
Monami Sharma
35fadd10bf
Spelling corrected for think*
Replaced "You should thin* of the mitmproxy" to "You should think* of the mitmproxy"
2018-02-24 11:12:57 -06:00
Aldo Cortesi
eee109117f
Merge pull request #2905 from cortesi/opts
Start migrating addon options into /addons
2018-02-24 17:20:53 +13:00
Aldo Cortesi
3a766a420c
Merge branch 'master' into opts 2018-02-24 16:47:58 +13:00
Aldo Cortesi
4fe83be63c Resolve some left-over cross-addon dependencies 2018-02-24 16:06:11 +13:00
Aldo Cortesi
f361ea491c addon options: upstream_auth
Also the last "easy" option to shift.
2018-02-24 15:58:37 +13:00
Aldo Cortesi
2aa7ac584b addon options: stickycookie, streambodies 2018-02-24 15:49:38 +13:00
Aldo Cortesi
704c1db1b7 addon options: setheaders, stickyauth 2018-02-24 15:45:12 +13:00
Aldo Cortesi
12633adeb9 addon options: readfile, save, script 2018-02-24 15:28:43 +13:00
Aldo Cortesi
144b559b46 addon options: migrate replace, simplify taddons.context 2018-02-24 15:22:28 +13:00
Aldo Cortesi
52c8d7e0f8 addon options: shift server_replay options 2018-02-24 15:00:40 +13:00
Aldo Cortesi
74a0230788 addon options: shift keepserving and onboarding options 2018-02-24 14:53:54 +13:00
Aldo Cortesi
a12d149230 client options: migrate allowremote and clientplayback
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.
2018-02-24 14:39:03 +13:00
Aldo Cortesi
42094b29ff Clean up un-necessary arguments to taddons.context
Also test coverage ++
2018-02-24 13:22:15 +13:00
Aldo Cortesi
af39e022ef Add .pytest_cache to .gitignore 2018-02-24 12:16:31 +13:00
Aldo Cortesi
4522a6f7b7 Start moving addon options into /addons
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.
2018-02-24 12:13:52 +13:00
Aldo Cortesi
16dd7f3ddf
Merge pull request #2886 from tran-tien-dat/set-cookie
Parse Set-Cookie header more permissively. Fix #2829
2018-02-24 10:49:33 +13:00
Aldo Cortesi
946c56d1a9
Merge pull request #2904 from cortesi/bump
Bump version
2018-02-24 10:35:42 +13:00
Aldo Cortesi
250ffcc83b Bump version
Re-bump after tag
2018-02-24 10:01:02 +13:00
Aldo Cortesi
f1b4704769
Merge pull request #2903 from cortesi/3.0.2
Tag 3.0.2
2018-02-24 09:55:07 +13:00
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
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
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