Commit Graph

7806 Commits

Author SHA1 Message Date
requires.io
be1bfbcba4 [requires.io] dependency update 2017-09-14 05:10:47 +02:00
Maximilian Hils
930d78b554 Merge pull request #2537 from ujjwal96/content-view
JS beautifier
2017-09-04 19:49:42 +02:00
Maximilian Hils
ca91780ff4 do not fail CI for missing newlines
this regularly stalls pull requests and serves no further purpose,
so it needs to go.
2017-09-04 18:08:00 +02:00
Maximilian Hils
f6f9944160 pyinstaller: add passlib hook 2017-09-04 18:07:27 +02:00
Maximilian Hils
68fab8bd92 Merge pull request #2560 from mhils/mitmproxy-net-tls
Split TLS parts from net.tcp into net.tls
2017-09-04 17:32:49 +02:00
Maximilian Hils
de006ea8ad move hostname validation into mitmproxy.net.tls 2017-09-04 14:02:43 +02:00
Thomas Kriechbaumer
96854cff52 Merge pull request #2558 from Kriechi/linux-docs
update installation docs
2017-09-04 09:51:44 +02:00
Thomas Kriechbaumer
f9d4d5f19c update installation docs 2017-09-04 09:51:14 +02:00
Maximilian Hils
1b05e7c953 Merge pull request #2561 from mhils/no-tornado-warnings
Suppress tornado logging in tests
2017-09-04 01:57:35 +02:00
Maximilian Hils
0b79304e98 suppress tornado logging in tests 2017-09-03 21:22:21 +02:00
Maximilian Hils
f46e5e667f remove jsbeautifier dependency 2017-09-03 21:02:29 +02:00
Maximilian Hils
e1877577bc make split_special_areas more flexible, refs #2537
(cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)
2017-09-03 21:02:29 +02:00
Ujjwal Verma
8030f5003d Added test 2017-09-03 21:02:29 +02:00
Ujjwal Verma
b05bf588e6 JS beautifier 2017-09-03 21:02:29 +02:00
Maximilian Hils
2b4f58eb44 split TLS parts from net.tcp into net.tls 2017-09-03 03:06:15 +02:00
Suraj Tripathi
781369a326 fix #2477 (#2556) 2017-09-01 23:08:34 +02:00
Maximilian Hils
7bd930693e Merge pull request #2551 from MatthewShao/static-viewer
[web] Add settings.json to Static viewer
2017-08-31 15:22:07 +02:00
Matthew Shao
a98dd1642c [web] Update test for static viewer. 2017-08-30 21:15:04 +08:00
Matthew Shao
0647d622a4 [web] Add settings.json to static viewer, so it can display version. 2017-08-30 21:13:51 +08:00
Maximilian Hils
9942f78217 Merge pull request #2542 from mhils/fast-css
Replace cssutils with custom, faster, css prettifier
2017-08-26 18:18:58 +02:00
Maximilian Hils
e1af76e71f fix strutils.split_special_areas 2017-08-26 17:04:56 +02:00
Maximilian Hils
1000efb671 remove cssutils dependency 2017-08-24 20:39:38 +02:00
Maximilian Hils
8eb6558570 add new, faster css prettifier 🎉 2017-08-24 20:39:21 +02:00
Maximilian Hils
72ac89f666 add strutils.escape_special_areas 2017-08-24 18:57:32 +02:00
Maximilian Hils
6350d5a19e update mitmweb assets (gulp prod) 2017-08-22 01:06:46 +02:00
Maximilian Hils
58642d57f6 [web] make it possible to run static viewer in subdirectories 2017-08-22 01:05:29 +02:00
Maximilian Hils
721f7cc92e Merge pull request #2540 from mhils/relatively-static
Make it possible to run static viewer in subdirectories
2017-08-22 00:59:51 +02:00
Maximilian Hils
7e154171bf Merge pull request #2539 from mhils/fix-mitmweb-shutdown
Fix mitmweb master shutdown, tests++
2017-08-22 00:31:00 +02:00
Maximilian Hils
bf243244ce [web] make it possible to run static viewer in subdirectories 2017-08-21 23:46:48 +02:00
Maximilian Hils
194883fc6a fix gulpfile copy mistake 2017-08-21 22:47:15 +02:00
Maximilian Hils
ca3e98640c fix mitmweb master shutdown, tests++ 2017-08-21 21:39:40 +02:00
Maximilian Hils
80d149f7bf actually fix tests
*hides*
2017-08-21 17:44:59 +02:00
Maximilian Hils
fa8bc78ca8 fix tests 2017-08-21 17:35:32 +02:00
Maximilian Hils
1e379b356f move tests... 2017-08-21 17:34:13 +02:00
Maximilian Hils
7809bd6fe7 move static viewer to fix pyinstaller 2017-08-21 17:29:35 +02:00
Maximilian Hils
e02138d177 travis: build binaries on precise to lessen glibc reqs, refs #2445 2017-08-21 17:29:29 +02:00
Maximilian Hils
7fcc945b4f Merge pull request #2510 from MatthewShao/static-viewer
[WIP][web]Static viewer converter for mitmweb
2017-08-21 15:08:25 +02:00
Matthew Shao
2baa2c4049 [web] Move static viewer from default addon to WebMaster. 2017-08-21 09:41:13 +08:00
Maximilian Hils
9d3759728a Merge pull request #2534 from Kriechi/fix-dep
bump rtool dependencies
2017-08-18 17:33:53 +02:00
Thomas Kriechbaumer
5931c40d3c bump rtool dependencies 2017-08-18 09:57:08 +02:00
Matthew Shao
d008f179c3 [web] Static_viewer coverage ++. 2017-08-17 21:40:52 +08:00
Matthew Shao
af30930ae8 [web] Add tests for StaticViewer and minor fixes. 2017-08-17 11:17:15 +08:00
Matthew Shao
d687ebc1ea [web] Minor fixes. 2017-08-17 09:01:40 +08:00
Maximilian Hils
a006cab5ce Merge pull request #2489 from MatthewShao/options-into-own-addon
Move console-related options into their own addon
2017-08-16 22:52:02 +02:00
Maximilian Hils
4fb255a7af make static viewer more testable, print slow contentviews 2017-08-16 19:13:13 +02:00
Maximilian Hils
7c650aa53b Merge pull request #2530 from mhils/nicer-clienthello-alpns
Improve ClientHello.alpn_protocols API
2017-08-16 19:10:27 +02:00
Maximilian Hils
74a04f41ee improve ClientHello.alpn_protocols API 2017-08-16 14:48:46 +02:00
Matthew Shao
3f497640ab [web] Update tests. 2017-08-16 09:42:24 +08:00
Thomas Kriechbaumer
92ab90bb89 Merge pull request #2527 from mitmproxy/revert-2511-master
Revert "Fix version conflict"
2017-08-15 16:53:59 +02:00
Thomas Kriechbaumer
68839077b6 Revert "Fix version conflict" 2017-08-15 16:32:18 +02:00