cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Merge branch 'master' into settings	Jason	2016-06-17	36	-1514/+1471
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
\| * \|	[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	2	-224/+224
\| \| \|
\| * \|	[web] Editor & Prompt	Jason	2016-06-17	9	-344/+339
\| \| \|
\| * \|	[web] FlowView and ContentView	Jason	2016-06-17	21	-989/+947
\| \|/
* \|	[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	5	-32/+92
\|/
*	web: fix tests	Maximilian Hils	2016-06-16	1	-2/+1
\|
*	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	10	-355/+361
\|
*	[web] fix updateLocation	Jason	2016-06-09	3	-7/+12
\|
*	[web] rewrite ProxyApp and MainView with es6	Jason	2016-06-09	5	-356/+380
\|
*	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
\|
*	web: fix list reducer	Maximilian Hils	2016-06-05	1	-3/+3
\|
*	web: completely move flow state to redux	Maximilian Hils	2016-06-04	8	-330/+191
\|
*	web interleave old store and redux flow state	Maximilian Hils	2016-06-04	3	-4/+17
\|
*	web: implement update and remove for list and view	Maximilian Hils	2016-06-04	3	-20/+95
\|
*	web: add flows to redux state	Maximilian Hils	2016-06-03	4	-6/+40
\|
*	web: add redux list views	Maximilian Hils	2016-06-03	3	-7/+73
\|
*	web: remove old event log store	Maximilian Hils	2016-06-03	5	-45/+7
\|
*	web: implement redux store fetching	Maximilian Hils	2016-06-03	6	-38/+158
\|
*	Merge branch 'redux-ducks'	Maximilian Hils	2016-06-02	13	-197/+285
\|\
\| *	web: fix eventlog height registration	Maximilian Hils	2016-06-02	1	-11/+16
\| \|
\| *	web: reduxify event log store	Maximilian Hils	2016-06-02	8	-80/+84
\| \|
\| *	web: reduxify WebSocket	Maximilian Hils	2016-06-02	6	-26/+81
\| \|
\| *	remove reducers directory	Maximilian Hils	2016-06-02	1	-8/+0
\| \|
\| *	web: :hatching_chick:	Maximilian Hils	2016-06-02	12	-180/+138
\| \|
\| *	use object spread operator	Maximilian Hils	2016-06-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \|	While the spread operator is not part of ES6, React also uses it for JSX. It makes sense for us to keep it in other parts of the codebase as well.