Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity
6,934 Commits 1 Branch 67 Tags 50 MiB
3262b6e705
Commit Graph

6934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
3262b6e705 Squashed commit of the following: 
commit edfbd41200a854f0bb7bb99f8bb70af9dbb9b8e0
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Tue Jul 25 01:19:53 2017 -0500

    Extended view.load test to check for unhandled IOError exception.

commit a523b534bc59ea97ed1fd5a3e6f78112fee19b6f
Author: requires.io <support@requires.io>
Date:   Mon Jul 24 21:25:04 2017 +0200

    [requires.io] dependency update

commit c725540c6eb92c003616b649ba43bee1f14e56ac
Author: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date:   Mon Jul 24 21:01:25 2017 +0200

    update travis

commit eeb6cfb4c76e60ac1813b839f589cd489c041c6c
Author: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date:   Mon Jul 24 21:03:14 2017 +0200

    [requires.io] dependency update on master branch (#2435)

commit 51a2672c782ee8ba8c7d5c7116073feccb4d8430
Author: Maximilian Hils <git@maximilianhils.com>
Date:   Mon Jul 24 19:03:01 2017 +0200

    require latest mypy version (refs #2452)

commit 5685a4850af6edda7100cae900487955c8b7a3ab
Author: Maximilian Hils <git@maximilianhils.com>
Date:   Fri Jul 21 11:24:42 2017 +0200

    fix addon tracebacks

    `.tb_next` discards the first interesting frame,
    this shouldn't happen.

commit a2da9b6c02030293f3a412d16df819868c581a29
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Sat Jul 22 12:30:15 2017 -0500

    Added os.path.expanduser() before open() calls with user supplied paths

commit 05db6e32c7957f267e97c34aa8f5a3cd6cb7dbb2
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Fri Jul 21 16:25:16 2017 -0500

    Added support for the ~ path shortcut when loading flows from disk.
    for consistency. Saving flows supports using paths with the ~ shortcut.

commit b7f864b6bbd221093aeb1c384dd16038f490441a
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Fri Jul 21 16:06:38 2017 -0500

    Fixed crash when loading flows from a file that does not exist
 2017-07-25 21:55:26 +02:00
Thomas Kriechbaumer
2868a0808a Merge pull request #2467 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2017-07-24 22:08:05 +02:00
Thomas Kriechbaumer
960262e4ed Merge pull request #2466 from Kriechi/update-travis 
update travis
 2017-07-24 22:07:52 +02:00
requires.io
31db24599a [requires.io] dependency update 2017-07-24 21:25:04 +02:00
Thomas Kriechbaumer
4b7fa6b3bf Merge pull request #2459 from mhils/fix-tb 
Fix addon tracebacks
 2017-07-24 21:10:39 +02:00
Thomas Kriechbaumer
5916178d60 update travis 2017-07-24 21:03:38 +02:00
Thomas Kriechbaumer
28c326031a [requires.io] dependency update on master branch (#2435) 2017-07-24 21:03:14 +02:00
Maximilian Hils
5c4b0d4132 require latest mypy version (refs #2452) 2017-07-24 19:03:01 +02:00
Maximilian Hils
3209704086 fix addon tracebacks 
`.tb_next` discards the first interesting frame,
this shouldn't happen.
 2017-07-21 11:25:17 +02:00
Maximilian Hils
e1d0bc6de9 Merge pull request #2430 from MatthewShao/mitmweb-options 
[web] [WIP] Mitmweb options
 2017-07-20 18:01:53 +02:00
Maximilian Hils
8526ca9e17 Merge pull request #2454 from mhils/minor-improvements 
Minor improvements
 2017-07-20 17:45:40 +02:00
Maximilian Hils
7b0485d6d6 update mypy 2017-07-20 16:27:13 +02:00
Matthew Shao
cb73658dd4 [web] Remove js/ducks/ui/option.js 2017-07-20 22:26:28 +08:00
Maximilian Hils
8b0b4c42b0 Merge pull request #2455 from mhils/script-fixes 
Fix loading scripts with same filename
 2017-07-20 16:00:58 +02:00
Maximilian Hils
9176626dab fix type declaration 2017-07-20 15:43:36 +02:00
Maximilian Hils
b7bda8f4b2 shorten option help 
We can have longer versions in the docs, but this makes the
options pages quite hard to parse.
 2017-07-20 15:27:41 +02:00
Maximilian Hils
94d28831e1 replace deprecated use of SourceFileLoader.load_module 2017-07-20 15:23:22 +02:00
Maximilian Hils
779677bcc6 fix loading scripts with same filename 2017-07-20 15:21:09 +02:00
Matthew Shao
f465f08c9a [web] Minor fix and update tests. 2017-07-20 15:39:43 +08:00
Matthew Shao
cbf5db9a4f [web] Fix line breaking in StringSequenceOption. 2017-07-19 22:24:45 +08:00
Matthew Shao
c2f0b94fb7 [web] sorting the options and minor improve ux. 2017-07-18 14:46:18 +08:00
Matthew Shao
70bb123101 Merge branch 'mitmweb-options' of https://github.com/MatthewShao/mitmproxy into mitmweb-options 2017-07-18 09:14:28 +08:00
Maximilian Hils
183079f731 [web] options: add some styling, minor fixes 2017-07-17 21:13:24 +02:00
Maximilian Hils
babd967eb8 [web] options: make help and err permanently visible, improve perf 2017-07-17 21:04:01 +02:00
Matthew Shao
21b3f9c029 [web] Update OptionMaster. 2017-07-17 13:59:25 +02:00
Matthew Shao
ec5061327f [web] Add reducer and actions for option editor. 2017-07-17 13:59:25 +02:00
Matthew Shao
6be1c2efb9 [web] Add simple validation and improve UI. 2017-07-17 13:59:25 +02:00
Matthew Shao
1f5ede2857 [web] Update error msg in PUT /options API. 2017-07-17 13:59:25 +02:00
Matthew Shao
0b8b943b0b [web] Update tests. 2017-07-17 13:59:25 +02:00
Matthew Shao
73685da78b [web] Try StringSequence update logic and add tooltip. 2017-07-17 13:59:25 +02:00
Matthew Shao
e1ee21d8bb [web] Update test. 2017-07-17 13:59:25 +02:00
Matthew Shao
5df15208d6 [web] Add PureStringSequenceOption type to OptionMaster.jsx 2017-07-17 13:59:25 +02:00
Matthew Shao
4a02822b34 [web] Update OptionMaster. 2017-07-17 15:32:52 +08:00
Matthew Shao
c19a184ba2 [web] Add reducer and actions for option editor. 2017-07-17 15:28:06 +08:00
Matthew Shao
80091c859a [web] Add simple validation and improve UI. 2017-07-15 22:54:33 +08:00
Matthew Shao
ca8364404d [web] Update error msg in PUT /options API. 2017-07-15 22:53:11 +08:00
Maximilian Hils
a81cd18d92 make eventsequence.iterate extendable 2017-07-15 12:26:38 +02:00
Maximilian Hils
af777f9b4f remove --shortversion 
this has no benefit over --version and clutters our cmdline options.
 2017-07-15 12:21:15 +02:00
Thomas Kriechbaumer
374c27feb6 Merge pull request #2436 from ujjwal96/addon 
Allow remote Addon
 2017-07-15 10:57:45 +02:00
Thomas Kriechbaumer
74708d546b Update test_allowremote.py 2017-07-15 10:01:14 +02:00
Ujjwal Verma
fdc64be04a Allow remote addon 2017-07-15 10:01:14 +02:00
Maximilian Hils
be9c5084c5 make issue template more concise 2017-07-13 14:56:52 +02:00
Thomas Kriechbaumer
3814f171dd Merge pull request #2427 from ujjwal96/protobuf 
Kaitai parser for protobuf
 2017-07-10 22:58:38 +02:00
Matthew Shao
73855908da [web] Update tests. 2017-07-10 20:43:59 +08:00
Matthew Shao
89a300fe3e [web] Try StringSequence update logic and add tooltip. 2017-07-10 20:42:24 +08:00
Ujjwal Verma
3f269d2b68 Kaitai parser for protobuf 2017-07-10 01:24:43 +05:30
Thomas Kriechbaumer
b115c25dcc [requires.io] dependency update on master branch (#2426) 2017-07-09 09:44:24 +02:00
Matthew Shao
1cc143d502 [web] Update test. 2017-07-07 10:20:12 +08:00
Matthew Shao
30fbcfa355 [web] Add PureStringSequenceOption type to OptionMaster.jsx 2017-07-07 10:18:29 +08:00
Maximilian Hils
062a58f848 Merge pull request #2423 from MatthewShao/mitmweb-options 
[web] [WIP] Mitmweb options editor content
 2017-07-05 16:25:38 +02:00