Matthew Shao
6962a2c3f2
Fix the tests for flows actions.
2017-04-25 19:29:52 +08:00
Matthew Shao
dcac976a47
Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest-dev
2017-04-25 19:27:53 +08:00
Maximilian Hils
161cdff25e
simplify selectRelative, add example for action testing
2017-04-24 15:13:45 +02:00
Matthew Shao
ae71ec1d30
[web] Coverage++ for ducks/flows.js
2017-04-24 14:18:12 +02:00
Thomas Kriechbaumer
90c425bd14
Merge pull request #2256 from ujjwal96/ip-formatting
...
Fixed formatting in mitmdump
2017-04-22 10:33:07 +02:00
Ujjwal Verma
73692b909b
Fixed formatting in mitmdump
2017-04-22 11:24:22 +05:30
Maximilian Hils
6af72160bf
[requires.io] dependency update on master branch ( #2252 )
2017-04-20 15:29:42 +02:00
Maximilian Hils
3d7cde058b
[requires.io] dependency update on master branch ( #2241 )
2017-04-17 10:49:17 +02:00
Thomas Kriechbaumer
9c18f0ba09
Merge pull request #2240 from mitmproxy/requires-io-master
...
[requires.io] dependency update on master branch
2017-04-16 22:12:04 +02:00
Maximilian Hils
3aa7f24992
Update setup.py
2017-04-16 19:44:26 +02:00
requires.io
3afeb7c7e9
[requires.io] dependency update
2017-04-16 19:42:32 +02:00
Maximilian Hils
be5e276d45
Merge pull request #2239 from Kriechi/update-kaitai
...
update kaitai and recompile formats
2017-04-16 19:42:19 +02:00
Thomas Kriechbaumer
83a428e0b7
manually fix imports
2017-04-16 15:51:12 +02:00
Thomas Kriechbaumer
dadb50946e
update kaitai and recompile formats
2017-04-16 15:51:11 +02:00
Maximilian Hils
ec6be96f2a
Merge pull request #2234 from ujjwal96/ip-formatting
...
Fixes IP address formatting #2109
2017-04-10 20:24:15 +02:00
Ujjwal Verma
742127ef7b
Fixes #2109
2017-04-09 18:55:20 +05:30
Maximilian Hils
c7b5012752
Merge pull request #2232 from r1b/master
...
fixes ipv6 authority form parsing in CONNECT
2017-04-09 01:15:50 +02:00
Robert C Jensen
7365f18542
fixes ipv6 authority form parsing in CONNECT
2017-04-07 15:46:21 -04:00
Maximilian Hils
c76620c19f
Merge pull request #2227 from vinaydargar/grammarphrasing
...
Replace phrase 'the the' in 2 places
2017-04-04 02:26:10 +02:00
Vinay Dargar
55ba6ed14d
Replace phrase 'the the' in 2 places
...
Replaced with the appropriate "in the" and "to the".
There are multiple other occurences of this but they are in upstream python modules.
2017-04-02 21:37:38 +05:30
Thomas Kriechbaumer
8567300dd6
Merge pull request #2224 from jonathanrfisher1/patch-1
...
Replace phrase "an TLS" with "a TLS"
2017-03-29 20:43:14 +02:00
jonathanrfisher1
677b9186ae
Replace phrase "an TLS" with "a TLS"
...
Updating usage of 'a' or 'an' to be more consistent with general English grammatical rules. TLS is pronounced with a consonant sound for both the expanded and abbreviated versions.
2017-03-29 14:12:33 -04:00
Thomas Kriechbaumer
9e3edd16c2
Merge pull request #2223 from krsoninikhil/empty-logbuffer
...
Add tests for set_focus
2017-03-29 16:57:37 +02:00
Nikhil Soni
442999c75c
Add tests for set_focus
2017-03-29 18:34:17 +05:30
Thomas Kriechbaumer
98957673f0
Merge pull request #2222 from BasThomas/patch-1
...
Add syntax highlighting to Readme
2017-03-29 13:53:06 +02:00
Bas Broek
dc37f7fd00
Add syntax highlighting to Readme
2017-03-29 13:36:51 +02:00
Thomas Kriechbaumer
034ca20d3c
Merge pull request #2220 from krsoninikhil/empty-logbuffer
...
eventlog: Override set_focus to check for index error
2017-03-28 21:35:43 +02:00
Nikhil Soni
70a0f87570
Override set_focus to check for index error
2017-03-29 00:14:37 +05:30
Matthew Shao
15c19d2bc6
[web] Coverage++ for ducks/flows.js
2017-03-28 20:44:49 +08:00
Maximilian Hils
9c686ca14c
Merge pull request #2212 from MatthewShao/jest-dev
...
[web] Update Jest config and coverage ++
2017-03-27 17:04:13 +02:00
Maximilian Hils
1909778e3d
Merge pull request #2215 from mitmproxy/proxapp.local-1
...
proxapp -> proxapp.local
2017-03-26 16:09:26 +02:00
Matthew Shao
9a604b5cfe
[web] Minor fixes for the test.
2017-03-26 21:58:47 +08:00
Matthew Shao
17ac1ff6cb
[web] Exclude src/js/filt/filt.js from coverage report.
2017-03-26 21:38:00 +08:00
Maximilian Hils
482c1579f2
proxapp -> proxapp.local
...
Chrome doesn't like it if there's no TLD.
2017-03-26 15:02:47 +02:00
Matthew Shao
de9ecb7c30
[web] Add JS coverage to codecov.
2017-03-26 09:36:18 +08:00
Matthew Shao
31a45ddaaa
[web] Reach 100% coverage for ducks/settings.js
2017-03-26 09:34:45 +08:00
Maximilian Hils
6f00c1bc5d
Merge pull request #2213 from Kriechi/concurrent-coverage
...
fix #2201
2017-03-25 17:16:31 +01:00
Thomas Kriechbaumer
20776cf2fa
fix #2201
2017-03-25 16:41:53 +01:00
Aldo Cortesi
c6a16e95e8
Merge pull request #2206 from cortesi/addonload
...
addon refactoring
2017-03-25 11:42:43 +13:00
Aldo Cortesi
65f0885bd6
addon loader: add boot_into, which replaces returning from start()
...
While we're here, expand test coverage for addonmanager to 100%, and promote to
individual coverage.
2017-03-25 10:48:12 +13:00
Aldo Cortesi
d69a411303
addons: an addonmanager.Loader is now passed to the load() event
2017-03-25 10:48:12 +13:00
Aldo Cortesi
541c1e8b9f
addons: start -> load throughout
2017-03-25 10:48:12 +13:00
Maximilian Hils
b531353ee0
Merge pull request #2208 from Kriechi/bump-h2
...
bump h2
2017-03-24 21:43:14 +01:00
Thomas Kriechbaumer
ef9f0e22ea
bump h2
2017-03-24 21:27:14 +01:00
Aldo Cortesi
335861f490
Merge pull request #2207 from nikofil/scripts-redirect-stdout
...
scripts: redirect stdout to ctx.log.warn
2017-03-24 14:58:33 +13:00
Nikos Filippakis
abf291b0f9
scripts: redirect stdout to ctx.log.warn
...
Redirect messages written to stdout in scripts to ctx.log.warn.
(closes #1530 )
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
2017-03-24 02:35:02 +01:00
Aldo Cortesi
439c113989
Merge pull request #2204 from cortesi/consoleopts
...
console options: load and save options to and from file
2017-03-24 10:05:37 +13:00
Aldo Cortesi
0d3e2c6adf
optmanager: make serialization and loading more robust
...
Also handle errors in console options manager.
2017-03-24 09:37:17 +13:00
Aldo Cortesi
3a35c69986
Merge pull request #2203 from cortesi/malformedreq
...
Don't pass malformed request objects to our error handler
2017-03-24 09:30:09 +13:00
Aldo Cortesi
eb66456d16
console: read and write options to and from file
2017-03-23 11:28:08 +13:00
