1375 Commits

Author	SHA1	Message	Date
David Erwin	ebdf4b5ec7	Merge branch 'master' into open-closed-stream-buttons	2017-03-09 13:15:45 -05:00
Riley Davis	0db92974c4	make only the title clickable	2017-03-09 11:05:18 -07:00
David Erwin	f64063ba14	Merge branch 'master' into flag-username-reset	2017-03-09 12:57:09 -05:00
David Jay	fd9f838948	Merge branch 'master' into open-closed-stream-buttons	2017-03-09 12:39:54 -05:00
Riley Davis	c064bee4f6	Merge branch 'master' into flag-username-reset	2017-03-09 10:27:27 -07:00
Riley Davis	895d3c31fc	Merge branch 'master' into bugfix-mod-queue-refresh	2017-03-09 10:24:25 -07:00
Belén Curcio	9bfc7d2037	Merge branch 'master' into long-titles	2017-03-09 11:05:08 -05:00
Belen Curcio	438877d58f	Merge branch 'long-titles' of github.com:coralproject/talk into long-titles	2017-03-09 11:03:37 -05:00
Belen Curcio	ce7a2d54d0	Font Size	2017-03-09 10:59:28 -05:00
David Jay	9b53930861	Merge branch 'master' into flag-username-reset	2017-03-08 17:49:59 -05:00
riley	2cdf2bb332	add moderate button	2017-03-08 15:26:45 -07:00
Riley Davis	7b5721e0c6	Merged branch open-closed-stream-buttons into open-closed-stream-buttons	2017-03-08 15:00:09 -07:00
Riley Davis	b34758e8cc	unused vars	2017-03-08 14:59:55 -07:00
Riley Davis	ee84b821fc	Merge branch 'master' into mod-squad	2017-03-08 14:57:19 -07:00
Riley Davis	c9e5b91b18	Merge branch 'master' into open-closed-stream-buttons	2017-03-08 14:53:24 -07:00
Riley Davis	eaf035acd6	simplify dashboard table rendering	2017-03-08 14:53:07 -07:00
Riley Davis	e4cdc73bf8	fix for react-mdn-selectfield in FF	2017-03-08 13:53:39 -07:00
David Jay	3262d136b7	Resetting report menu on close.	2017-03-08 15:44:19 -05:00
David Jay	3c28f68d0a	Merge branch 'master' into mod-squad	2017-03-08 15:32:48 -05:00
David Jay	a13e0205de	Merge branch 'master' into open-closed-stream-buttons	2017-03-08 15:22:08 -05:00
David Jay	be3212e144	Merge branch 'master' into banned-optimize-bug	2017-03-08 15:05:12 -05:00
David Jay	510ee2c28e	Merge branch 'master' into bugfix-mod-queue-refresh	2017-03-08 15:04:45 -05:00
David Jay	15193e97a8	Preventing keys from scrolling past the end of the comment queue.	2017-03-08 13:01:37 -05:00
Riley Davis	0863ca26ff	update dashboard links	2017-03-08 09:56:36 -07:00
Riley Davis	097fc30ac9	Merge branch 'master' into bugfix-mod-queue-refresh	2017-03-08 09:35:05 -07:00
Riley Davis	bc1fc15572	Merge branch 'master' into banned-optimize-bug	2017-03-08 09:34:55 -07:00
Riley Davis	68d64665a9	Merge branch 'master' into keyboard-shortcuts	2017-03-08 09:34:38 -07:00
Samantha Hankins	9d2d878790	Merge branch 'master' into long-titles	2017-03-07 17:17:44 -05:00
Belen Curcio	cceeafadec	Indent	2017-03-07 16:53:42 -05:00
Belen Curcio	af4a69a677	Changing icon and link	2017-03-07 16:50:36 -05:00
Belen Curcio	f563bcf119	Adding fix for long text	2017-03-07 16:35:01 -05:00
Belen Curcio	d1119604e0	ícon styling for infobox	2017-03-07 15:59:05 -05:00
Riley Davis	e578f901b2	fix some firefox display things	2017-03-07 13:38:01 -07:00
Belen Curcio	eb06f3892d	changes	2017-03-07 15:27:43 -05:00
Belen Curcio	ee30f549a1	Lato all the things	2017-03-07 15:04:35 -05:00
Belen Curcio	dc96b550a6	Button should inherit font	2017-03-07 14:56:28 -05:00
riley	c1d6a4dc7e	Merged master into banned-optimize-bug	2017-03-07 12:31:42 -07:00
Riley Davis	c4f2d876ee	Merge branch 'master' into notification-warning	2017-03-07 12:22:42 -07:00
David Jay	95aa89faed	Switching premod status update to updateQueries function.	2017-03-07 14:16:44 -05:00
Riley Davis	87ef7ffb67	Merge branch 'master' into reply-box-focus	2017-03-07 11:54:55 -07:00
David Jay	d0d0766ca6	Merge branch 'master' into notification-warning	2017-03-07 13:33:24 -05:00
David Jay	1e34ffd075	Merge branch 'master' into banned-optimize-bug	2017-03-07 13:31:12 -05:00
Riley Davis	e15e4b004f	Merge branch 'master' into keyboard-shortcuts	2017-03-07 11:26:58 -07:00
Riley Davis	37dad96fee	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/Configure/StreamSettings.js	2017-03-07 11:23:22 -07:00
David Jay	78a2a64671	Not displaying premod or rejected comments.	2017-03-07 13:13:21 -05:00
David Jay	ae5d35273b	Merge branch 'master' into global-info-bug	2017-03-07 12:58:25 -05:00
Riley Davis	5e4c251e83	style the pending comment correctly	2017-03-07 10:47:51 -07:00
Riley Davis	3a31ca8d38	blur the comment until it's ready	2017-03-07 10:06:03 -07:00
Riley Davis	09556c9bef	indention	2017-03-06 14:06:32 -07:00
Riley Davis	d9d086c61e	remove a banned comment after it's confirmed as rejected	2017-03-06 13:53:56 -07:00