227 Commits

Author	SHA1	Message	Date
Jason	26aed8f56f	[web] updateSettings -> handleWsMsg	2016-06-22 11:24:22 +08:00
Maximilian Hils	65955ee45f	add better description	2016-06-20 21:01:24 -07:00
Clemens	37475217bf	added tests for ui	2016-06-20 21:00:27 -07:00
Clemens	79834676cb	added accept and revert to flowmenu	2016-06-20 10:20:41 +02:00
Jason	d01e49c6d5	[web] replace SetttingsActions.update with settings.updateSettings	2016-06-19 02:53:15 +08:00
Maximilian Hils	f203936fbf	add setInterceptPattern action creator	2016-06-17 21:06:17 -07:00
Maximilian Hils	6a41ea9171	add fetchApi.put shortcut	2016-06-17 21:05:30 -07:00
Maximilian Hils	ce53799c62	simplify settings reducer	2016-06-17 21:03:19 -07:00
Jason	965b27b529	[web] simplify settings	2016-06-17 22:12:32 +08:00
Jason	c82d27b2a2	Merge branch 'master' into settings ... Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx	2016-06-17 21:58:24 +08:00
Jason	034287edcf	[web] clean up	2016-06-17 07:57:06 +08:00
Jason	7a78970d10	[web] common	2016-06-17 07:07:38 +08:00
Jason	4ce7a9ba77	[web] editor config for line endings	2016-06-17 06:26:46 +08:00
Jason	6ad2f13341	[web] fix settings ducks	2016-06-17 06:01:29 +08:00
Jason	cedac98b70	[web] promot reduce	2016-06-17 05:08:05 +08:00
Jason	7fb0836bfe	[web] remove store	2016-06-17 05:08:05 +08:00
Jason	b88937f1e0	[web] eliminate SettingsStore	2016-06-17 05:08:05 +08:00
Jason	99b2b8633d	[web] settings store	2016-06-17 05:08:05 +08:00
Jason	f5c597a9e3	[web] Editor & Prompt	2016-06-17 04:38:35 +08:00
Jason	e5bf1e930a	[web] FlowView and ContentView	2016-06-17 04:37:57 +08:00
Maximilian Hils	1fc2db85fa	web: fix tests	2016-06-16 03:06:08 -07:00
Maximilian Hils	848e7c6c50	web: use implicit bindActionCreators	2016-06-15 14:32:03 -07:00
Maximilian Hils	94e2929b3f	minor fixes	2016-06-15 13:39:56 -07:00
Clemens	48e372bf98	rename view -> ui, make code more readable	2016-06-15 08:54:55 +02:00
Clemens	00b4abfe83	add previous state to dispatch function	2016-06-15 00:19:33 +02:00
Clemens	003096b4cc	code review	2016-06-14 22:17:34 +02:00
Clemens	bf75e14573	added flowMenu	2016-06-14 11:20:48 +02:00
Jason	81a0c45c89	[web] header.js -> Header.js	2016-06-09 20:35:03 +08:00
Jason	6c95635cb8	[web] eventlog.js -> EventLog.jsx	2016-06-09 18:40:59 +08:00
Jason	1baefcdc99	[web] footer.js -> Footer.jsx	2016-06-09 18:13:18 +08:00
Jason	e24bf8d73f	[web] fix shortcut for header fields	2016-06-09 18:03:40 +08:00
Jason	f306cfa8b6	[web] separate flowtable to multiple files	2016-06-09 17:52:30 +08:00
Jason	8e538c7630	[web] fix updateLocation	2016-06-09 14:20:14 +08:00
Jason	851bb4bf68	[web] rewrite ProxyApp and MainView with es6	2016-06-09 13:35:41 +08:00
Maximilian Hils	7707d096d2	fix default websocket state	2016-06-08 19:41:34 -07:00
Clemens	ad84d650de	sorting add pr review changes	2016-06-08 10:29:33 +02:00
Clemens	dbbda03020	sorting done, ready to review	2016-06-07 11:22:52 +02:00
Clemens	fa3ad2382b	sorting done, ready to review	2016-06-07 11:07:25 +02:00
Clemens	1aac283e23	moved redux state injection closer to child	2016-06-07 11:07:25 +02:00
Clemens	ff2129773f	start with sort, continue tomorrow	2016-06-07 11:07:25 +02:00
Clemens	ac2d8549e5	moved sort state to redux, missing apply sort	2016-06-07 11:07:25 +02:00
Maximilian Hils	54ee8ff4d4	web: accept all falsey sortFns in sortedIndexOf	2016-06-06 15:47:31 -07:00
Maximilian Hils	d878122cf9	web: fix list update propagation	2016-06-05 18:43:17 -07:00
Maximilian Hils	e6ef149a03	web: modernize flow table columns	2016-06-05 18:23:06 -07:00
Maximilian Hils	efed5ab967	web: update react	2016-06-05 18:20:51 -07:00
Maximilian Hils	445a89e842	web: fix list reducer	2016-06-05 18:20:15 -07:00
Maximilian Hils	d53a2de0ba	web: completely move flow state to redux	2016-06-04 18:53:41 -07:00
Maximilian Hils	e880f532ad	web interleave old store and redux flow state	2016-06-04 00:58:13 -07:00
Maximilian Hils	b02d66491c	web: implement update and remove for list and view	2016-06-04 00:37:10 -07:00
Maximilian Hils	1b1ea98f08	web: add flows to redux state	2016-06-03 18:53:30 -07:00