cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Expand)	Author	Age	Files	Lines
*	[web] set connected to false when DISCONNECTED	Jason	2016-06-22	1	-1/+1
*	[web] store ws object in symbol property	Jason	2016-06-22	1	-3/+5
*	Merge remote-tracking branch 'origin/master' into websocket	Jason	2016-06-22	13	-86/+117
\|\
\| *	add better description	Maximilian Hils	2016-06-20	2	-7/+8
\| *	added tests for ui	Clemens	2016-06-20	4	-6/+41
\| *	added accept and revert to flowmenu	Clemens	2016-06-20	2	-6/+10
\| *	[web] replace SetttingsActions.update with settings.updateSettings	Jason	2016-06-19	7	-75/+65
* \|	Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket	Jason	2016-06-18	9	-166/+148
\|\\|
\| *	add setInterceptPattern action creator	Maximilian Hils	2016-06-17	2	-3/+13
\| *	add fetchApi.put shortcut	Maximilian Hils	2016-06-17	1	-3/+15
\| *	simplify settings reducer	Maximilian Hils	2016-06-17	3	-57/+56
\| *	[web] simplify settings	Jason	2016-06-17	1	-36/+8
\| *	Merge branch 'master' into settings	Jason	2016-06-17	37	-1514/+1472
\| \|\
\| * \|	[web] fix settings ducks	Jason	2016-06-17	2	-9/+25
\| * \|	[web] promot reduce	Jason	2016-06-17	1	-16/+19
\| * \|	[web] remove store	Jason	2016-06-17	3	-98/+7
\| * \|	[web] eliminate SettingsStore	Jason	2016-06-17	1	-5/+0
\| * \|	[web] settings store	Jason	2016-06-17	6	-33/+95
* \| \|	[web] add app ducks	Jason	2016-06-18	3	-11/+43
* \| \|	Merge branch 'master' into websocket	Jason	2016-06-17	37	-1509/+1467
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	[web] clean up	Jason	2016-06-17	2	-9/+2
\| * \|	[web] common	Jason	2016-06-17	11	-183/+194
\| * \|	[web] editor config for line endings	Jason	2016-06-17	3	-224/+225
\| * \|	[web] Editor & Prompt	Jason	2016-06-17	9	-344/+339
\| * \|	[web] FlowView and ContentView	Jason	2016-06-17	21	-989/+947
\| \|/
* /	[web] websocket	Jason	2016-06-17	4	-76/+110
\|/
*	web: fix tests	Maximilian Hils	2016-06-16	2	-12/+9
*	web: use implicit bindActionCreators	Maximilian Hils	2016-06-15	5	-15/+10
*	minor fixes	Maximilian Hils	2016-06-15	3	-14/+19
*	rename view -> ui, make code more readable	Clemens	2016-06-15	3	-11/+12
*	add previous state to dispatch function	Clemens	2016-06-15	4	-20/+30
*	code review	Clemens	2016-06-14	3	-41/+17
*	added flowMenu	Clemens	2016-06-14	6	-14/+124
*	[web] header.js -> Header.js	Jason	2016-06-09	11	-469/+516
*	[web] eventlog.js -> EventLog.jsx	Jason	2016-06-09	5	-155/+143
*	[web] footer.js -> Footer.jsx	Jason	2016-06-09	2	-25/+22
*	[web] fix shortcut for header fields	Jason	2016-06-09	2	-1/+2
*	[web] separate flowtable to multiple files	Jason	2016-06-09	12	-357/+364
*	[web] fix updateLocation	Jason	2016-06-09	3	-7/+12
*	[web] rewrite ProxyApp and MainView with es6	Jason	2016-06-09	6	-356/+385
*	fix default websocket state	Maximilian Hils	2016-06-08	1	-2/+2
*	sorting add pr review changes	Clemens	2016-06-08	4	-17/+26
*	sorting done, ready to review	Clemens	2016-06-07	1	-1/+1
*	sorting done, ready to review	Clemens	2016-06-07	3	-34/+26
*	moved redux state injection closer to child	Clemens	2016-06-07	2	-4/+6
*	start with sort, continue tomorrow	Clemens	2016-06-07	2	-6/+3
*	moved sort state to redux, missing apply sort	Clemens	2016-06-07	3	-47/+62
*	web: accept all falsey sortFns in sortedIndexOf	Maximilian Hils	2016-06-06	1	-8/+4
*	web: fix list update propagation	Maximilian Hils	2016-06-05	2	-3/+6
*	web: modernize flow table columns	Maximilian Hils	2016-06-05	2	-223/+148