cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
*	[web] fix flows data flow	Jason	2016-06-24	4	-12/+12
\|
*	[web] fix eventLog ducks	Jason	2016-06-23	1	-7/+1
\|
*	[web] fix data connection	Jason	2016-06-23	5	-10/+9
\|
*	[web] connect new ducks actions	Jason	2016-06-23	5	-13/+12
\|
*	[web] refactoring ducks/flows	Jason	2016-06-23	1	-1/+1
\|
*	added accept and revert to flowmenu	Clemens	2016-06-20	2	-6/+10
\|
*	[web] replace SetttingsActions.update with settings.updateSettings	Jason	2016-06-19	5	-43/+54
\|
*	add setInterceptPattern action creator	Maximilian Hils	2016-06-17	1	-3/+8
\|
*	simplify settings reducer	Maximilian Hils	2016-06-17	1	-10/+1
\|
*	Merge branch 'master' into settings	Jason	2016-06-17	35	-1513/+1468
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	20	-988/+944
\| \|
* \|	[web] fix settings ducks	Jason	2016-06-17	1	-1/+9
\| \|
* \|	[web] settings store	Jason	2016-06-17	1	-30/+3
\|/
*	web: use implicit bindActionCreators	Maximilian Hils	2016-06-15	5	-15/+10
\|
*	minor fixes	Maximilian Hils	2016-06-15	1	-3/+3
\|
*	rename view -> ui, make code more readable	Clemens	2016-06-15	1	-2/+2
\|
*	add previous state to dispatch function	Clemens	2016-06-15	1	-13/+15
\|
*	code review	Clemens	2016-06-14	2	-16/+11
\|
*	added flowMenu	Clemens	2016-06-14	4	-13/+71
\|
*	[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	8	-352/+358
\|
*	[web] fix updateLocation	Jason	2016-06-09	3	-7/+12
\|
*	[web] rewrite ProxyApp and MainView with es6	Jason	2016-06-09	4	-338/+354
\|
*	sorting add pr review changes	Clemens	2016-06-08	2	-8/+7
\|
*	sorting done, ready to review	Clemens	2016-06-07	1	-28/+2
\|
*	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	2	-47/+49
\|
*	web: modernize flow table columns	Maximilian Hils	2016-06-05	2	-223/+148
\|
*	web: completely move flow state to redux	Maximilian Hils	2016-06-04	3	-140/+81
\|
*	web interleave old store and redux flow state	Maximilian Hils	2016-06-04	1	-2/+11
\|
*	web: remove old event log store	Maximilian Hils	2016-06-03	1	-5/+1
\|
*	web: implement redux store fetching	Maximilian Hils	2016-06-03	1	-1/+0
\|
*	Merge branch 'redux-ducks'	Maximilian Hils	2016-06-02	4	-161/+122
\|\
\| *	web: fix eventlog height registration	Maximilian Hils	2016-06-02	1	-11/+16
\| \|
\| *	web: reduxify event log store	Maximilian Hils	2016-06-02	1	-45/+24
\| \|
\| *	web: reduxify WebSocket	Maximilian Hils	2016-06-02	1	-12/+12
\| \|
\| *	web: :hatching_chick:	Maximilian Hils	2016-06-02	4	-117/+80
\| \|
\| *	add basic redux architecture, convert eventlog to redux	Maximilian Hils	2016-06-02	2	-21/+35
\| \|
* \|	change some pr issuses	Clemens	2016-06-02	1	-3/+3
\| \|
* \|	basic file up and download working	Clemens	2016-06-02	1	-3/+12
\| \|
* \|	added basic file up_download functionality (not finish yet)	Clemens	2016-06-02	1	-18/+6
\| \|
* \|	added ui	Clemens	2016-06-02	1	-0/+12
\|/