Commit Graph

5153 Commits

Author SHA1 Message Date
Maximilian Hils e800f321af Merge pull request #1436 from dufferzafar/jsbeautifier
Use jsbeautifier from pip
2016-07-28 15:37:06 -07:00
dufferzafar 1cffa5f46b Use replace while decoding 2016-07-28 07:48:10 -07:00
dufferzafar 56d04b5740 Set upper bound on jsbeautifier package to 1.7 2016-07-28 07:41:54 -07:00
Maximilian Hils 83102b853f minor fixes 2016-07-27 19:38:36 -07:00
Aldo Cortesi 3636ed7d41 Merge pull request #1446 from cortesi/state
console: add replace_view_state, fix statusbar issues
2016-07-28 11:18:20 +12:00
Aldo Cortesi d6e4ef4ced console: add replace_view_state, fix statusbar issues
Fixes #1394
2016-07-28 11:01:32 +12:00
Aldo Cortesi 75ab006ca9 Merge pull request #1442 from cortesi/scripts
mitmdump: send script .done when terminating after flow read
2016-07-28 10:22:30 +12:00
Maximilian Hils 3aad011988 Merge pull request #1406 from gzzhanghao/fix36
[web] Update view with sortedUpdate
2016-07-27 14:55:08 -07:00
Aldo Cortesi 297cf5d565 mitmdump: send script .done when terminating after flow read
Fixes #1439
2016-07-28 09:35:25 +12:00
Clemens Brunner 41383b866e add favicon to mitmweb (#1440) 2016-07-27 11:20:36 -07:00
dufferzafar 583827ad3f Use strutils.native before sending data to jsbeautifier 2016-07-27 04:34:51 -07:00
dufferzafar 821413349e Re-order imports etc. 2016-07-27 04:34:51 -07:00
dufferzafar 21e6ecb47d Remove jsbeautifier files 2016-07-27 04:34:51 -07:00
dufferzafar 4ce2420545 Make contentview requirements mandatory 2016-07-27 04:34:51 -07:00
dufferzafar 303b6df447 Use jsbeautifier from pip 2016-07-27 04:33:16 -07:00
Jason 2b9e5dcd1b [web] change test files 2016-07-27 00:39:01 +08:00
Maximilian Hils d97fe767dc update dependencies (#1435) 2016-07-25 21:52:34 -07:00
Maximilian Hils 2c11cbeedb restrict accepted lxml versions to fix builds 2016-07-25 19:40:07 -07:00
Maximilian Hils 705d042629 fix #1432 2016-07-25 19:37:47 -07:00
Aldo Cortesi 38b43cc9f9 Merge pull request #1428 from dufferzafar/replay
Consolidate replay under R
2016-07-26 13:53:44 +12:00
Aldo Cortesi db22e72103 Merge pull request #1427 from mhils/grideditor
Refactor GridEditor
2016-07-26 13:38:04 +12:00
Maximilian Hils 817b675c52 Merge branch 'flow_editing_v2' 2016-07-25 17:51:38 -07:00
Maximilian Hils 3ebb58f641 add up/download button to ContentTooLarge view 2016-07-25 17:50:59 -07:00
Maximilian Hils 03a596d1d9 simplify stop edit 2016-07-25 17:45:42 -07:00
Maximilian Hils 67bfc1df14 fix flow edit 2016-07-25 17:31:37 -07:00
Maximilian Hils aee693a5c0 Merge remote-tracking branch 'jason/style' into flow_editing_v2 2016-07-25 17:13:00 -07:00
Maximilian Hils e1587b2bc1 make empty buttons editable 2016-07-25 17:12:39 -07:00
Maximilian Hils 70dbd1b32d web: refactor ContentLoader 2016-07-25 17:03:50 -07:00
Maximilian Hils 79ebcb046e Merge remote-tracking branch 'origin/master' into flow_editing_v2 2016-07-25 15:16:16 -07:00
Maximilian Hils 3254595584 minor fixes 2016-07-25 15:12:20 -07:00
Maximilian Hils ffe6593361 make sure to escape errors printed to the console 2016-07-25 14:37:19 -07:00
Jason 7b51f12813 [web] bug fix and add test 2016-07-26 02:09:54 +08:00
Clemens 68e437a740 rewrite getDiff 2016-07-25 17:33:36 +02:00
Clemens 1ea094e9dc remove auto change to raw mode on edit 2016-07-25 15:47:05 +02:00
Clemens ca4541613c combine content with header updates 2016-07-25 14:34:00 +02:00
Clemens 61ef7ca91b added contentHash 2016-07-25 10:56:12 +02:00
Clemens 0aedea6e60 remove lastFileUpload field 2016-07-25 09:05:24 +02:00
Shadab Zafar f164181f2e Consolidate replay under R 2016-07-25 10:19:34 +05:30
Maximilian Hils 2d985e964c py2: silence abc metaclass warnings 2016-07-24 21:17:41 -07:00
Maximilian Hils 480ae46b88 refactor grideditor for py3 compatibility 2016-07-24 21:17:41 -07:00
Maximilian Hils 56796aeda2 Merge pull request #1426 from mhils/query-encoding
Fix query/path_components encoding
2016-07-24 21:17:35 -07:00
Maximilian Hils f9edffc58e silence test warnings 2016-07-24 20:13:18 -07:00
Maximilian Hils 013288f7ca add quote/unquote tests 2016-07-24 19:38:44 -07:00
Maximilian Hils a682074e9e improve query/path_components getter/setter 2016-07-24 19:38:44 -07:00
Maximilian Hils c1bd4dabc8 Merge pull request #1425 from dufferzafar/clear-hotfix
Fix clearing of flows
2016-07-24 18:39:44 -07:00
Shadab Zafar b99da24529 Fix clearing of flows
Fixes #1424
2016-07-25 07:08:03 +05:30
Maximilian Hils ec6934d339 console: fix options signal 2016-07-24 11:15:28 -07:00
Maximilian Hils e9eee5a6da Merge pull request #1423 from dufferzafar/fix-search
Fix console search on Python 3
2016-07-24 09:53:18 -07:00
Shadab Zafar 71b6b84f29 Fix console search on Python 3 2016-07-24 22:21:04 +05:30
Maximilian Hils c5f3bb83f6 fix keyboard navigation 2016-07-24 09:43:29 -07:00