Commit Graph

4776 Commits

Author SHA1 Message Date
Thomas Kriechbaumer
566736c799 update appveyor with tox 2016-06-27 23:14:32 +02:00
Jason
37c2b47c26 [web] add tests for utils 2016-06-27 18:42:20 +08:00
Maximilian Hils
28531a4dd7 fix lxml installation on py27 2016-06-26 22:25:13 -07:00
Maximilian Hils
e7bdee56ef rtool: build py3 wheels an binaries 2016-06-26 22:13:42 -07:00
Maximilian Hils
588dad1bc7 minor docs fix 2016-06-26 14:42:12 -07:00
Maximilian Hils
ed9a72553d fix mitmproxy/mitmweb#25 2016-06-26 02:17:07 -07:00
Maximilian Hils
370e6caedc [web] (mostly) remove jQuery 2016-06-26 02:05:41 -07:00
Maximilian Hils
3eb2d04aac minor fixes 2016-06-26 01:45:45 -07:00
Maximilian Hils
1c240d919a [web] sorter -> sort 2016-06-25 19:58:11 -07:00
Jason
db415a26bc [web] log only in dev 2016-06-25 10:50:15 +08:00
Jason
a782571244 [web] build with envify 2016-06-25 10:43:30 +08:00
Jason
59dc5e4687 [web] update build 2016-06-25 10:09:21 +08:00
Jason
aecc267eb9 [web] fix imports 2016-06-25 10:06:38 +08:00
Jason
64fda2c735 [web] fix update filter 2016-06-25 10:03:51 +08:00
Jason
e400e9f513 [web] ErrorView 2016-06-25 09:52:49 +08:00
Jason
2b7923b4f4 [web] fix actions 2016-06-25 02:18:52 +08:00
Jason
8da623c603 [web] fix selectFlows 2016-06-25 00:53:56 +08:00
Jason
571c817f21 [web] add msgQueue 2016-06-25 00:36:39 +08:00
Jason
5a1677c387 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/app.jsx
	web/src/js/connection.js
	web/src/js/ducks/websocket.js
2016-06-24 21:04:39 +08:00
Maximilian Hils
21c3480429 Merge remote-tracking branch 'jason/websocket' 2016-06-23 23:38:19 -07:00
Maximilian Hils
ed05d3f858 Merge pull request #1285 from westurner/patch-1
DOC: install.rst: Installation on Fedora, Ubuntu
2016-06-23 15:44:29 -07:00
Jason
f392b8e34c [web] bug fix 2016-06-24 01:20:42 +08:00
Jason
c40ff0277b [web] fix bugs 2016-06-24 01:01:34 +08:00
Jason
e11d6600be [web] fix eventLog flow 2016-06-24 00:16:59 +08:00
Jason
1df67dbe9d [web] reduce eventlog view 2016-06-24 00:15:37 +08:00
Jason
7746deedc2 [web] code format 2016-06-24 00:13:05 +08:00
Jason
b2ffa06e32 [web] fix view data structure 2016-06-24 00:10:13 +08:00
Jason
7bc479bb3a [web] fix flows data flow 2016-06-24 00:03:32 +08:00
Jason
bd4cf8fef2 [web] ws methods 2016-06-23 23:56:24 +08:00
Jason
84683e7abb [web] check item existence before update 2016-06-23 23:48:17 +08:00
Jason
f50dc62249 [web] fix eventLog ducks 2016-06-23 23:44:53 +08:00
Jason
5adb7a54fd [web] separate views and list 2016-06-23 23:20:41 +08:00
Thomas Kriechbaumer
5d0de16f57 http2: improve error handling in tests 2016-06-22 22:09:57 +02:00
Maximilian Hils
aaf0bba496 Merge pull request #1291 from BSalita/master
Show how to upgrade pip.
2016-06-22 12:29:34 -07:00
Maximilian Hils
b3502b92c8 Merge pull request #1282 from dufferzafar/py3
Python 3 - mitmproxy.{protocol.http1, proxy, platform.pf}
2016-06-22 12:25:18 -07:00
Jason
397554b7c7 [web] update build 2016-06-23 01:30:34 +08:00
Jason
749d710665 [web] fix data connection 2016-06-23 01:30:28 +08:00
Jason
3c4e81aeff [web] fix utils/list 2016-06-23 01:23:16 +08:00
Jason
2358d79ac5 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list 2016-06-23 01:15:46 +08:00
Jason
72fdca49ec [web] connect new ducks actions 2016-06-23 01:15:14 +08:00
Jason
bcea39657a [web] fix ducks/flows 2016-06-23 01:06:45 +08:00
Jason
7671224b4c [web] remove ducks/utils/view 2016-06-23 01:02:29 +08:00
Jason
2a9a6f6151 [web] flows.makeFun 2016-06-23 01:01:39 +08:00
Jason
60ea300990 [web] FlowActions -> flows ducks 2016-06-23 00:58:45 +08:00
Jason
c0904e9aed [web] refactoring ducks/flows 2016-06-23 00:49:26 +08:00
Jason
a42512a1cc [web] finish utils/list 2016-06-23 00:17:35 +08:00
BSalita
a77e850b6f Show how to upgrade pip.
Windows install failed due to out of date pip. Show how to upgrade to latest pip.
2016-06-22 14:49:41 +02:00
Shadab Zafar
d655d8f1f3 py3++: mitmproxy.platform.pf 2016-06-22 13:38:00 +05:30
Shadab Zafar
c0ba47094d py3++: mitmproxy.protocol.http1 2016-06-22 13:37:41 +05:30
Shadab Zafar
119021a9c3 py3++: mitmproxy.proxy 2016-06-22 13:37:16 +05:30