cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
*	[web] fix actions	Jason	2016-06-25	1	-4/+5
\|
*	Merge remote-tracking branch 'origin/master' into websocket	Jason	2016-06-22	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
\| *	[web] replace SetttingsActions.update with settings.updateSettings	Jason	2016-06-19	1	-4/+3
\| \|
* \|	Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket	Jason	2016-06-18	1	-51/+26
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx web/src/js/connection.js
\| *	simplify settings reducer	Maximilian Hils	2016-06-17	1	-10/+1
\| \|
\| *	Merge branch 'master' into settings	Jason	2016-06-17	1	-21/+16
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
\| * \|	[web] fix settings ducks	Jason	2016-06-17	1	-1/+9
\| \| \|
\| * \|	[web] settings store	Jason	2016-06-17	1	-30/+3
\| \| \|
* \| \|	[web] add app ducks	Jason	2016-06-18	1	-3/+5
\| \| \|
* \| \|	Merge branch 'master' into websocket	Jason	2016-06-17	1	-16/+11
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
\| * \|	[web] clean up	Jason	2016-06-17	1	-5/+2
\| \| \|
\| * \|	[web] FlowView and ContentView	Jason	2016-06-17	1	-19/+17
\| \|/
* /	[web] websocket	Jason	2016-06-17	1	-10/+18
\|/
*	[web] header.js -> Header.js	Jason	2016-06-09	1	-2/+2
\|
*	[web] eventlog.js -> EventLog.jsx	Jason	2016-06-09	1	-1/+1
\|
*	[web] footer.js -> Footer.jsx	Jason	2016-06-09	1	-1/+1
\|
*	[web] fix shortcut for header fields	Jason	2016-06-09	1	-1/+1
\|
*	[web] separate flowtable to multiple files	Jason	2016-06-09	1	-0/+170