280 Commits

Author	SHA1	Message	Date
Clemens	48728af43a	moved flow editor state to redux	2016-07-19 12:23:20 +02:00
Clemens	87797d7ac0	added new btn, changed to codemirror	2016-07-15 14:41:30 +02:00
Clemens	5f3782dd5f	change way to edit	2016-07-14 23:01:34 +02:00
Clemens	45349b3597	chaged editor style	2016-07-13 20:53:05 +02:00
Clemens	baac6c4693	gzip issue	2016-07-13 20:44:35 +02:00
Clemens	121079934e	make file out ouf string to combine flow content updates via editor and fileupload	2016-07-13 20:18:04 +02:00
Clemens	f84098554a	added code editor and file upload	2016-07-13 18:16:31 +02:00
Clemens	544b1e3238	modify flow content	2016-07-11 19:49:58 +02:00
Jason	37c2b47c26	[web] add tests for utils	2016-06-27 18:42:20 +08: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	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
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
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
Jason	57af1d00dd	[web] set connected to false when DISCONNECTED	2016-06-22 11:29:21 +08:00
Jason	26aed8f56f	[web] updateSettings -> handleWsMsg	2016-06-22 11:24:22 +08:00
Jason	42f433e395	[web] use a dummy action to init list	2016-06-22 11:16:08 +08:00
Jason	1fc11974a7	[web] update eventlog	2016-06-22 11:12:58 +08:00
Jason	9a7415a58d	[web] store ws object in symbol property	2016-06-22 00:51:45 +08:00
Jason	0cab9ef1fa	Merge remote-tracking branch 'origin/master' into websocket ... Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx	2016-06-22 00:49:21 +08:00