1360 Commits

Author	SHA1	Message	Date
Riley Davis	db5df1699c	Merge branch 'master' into autoreject-on-ban	2017-03-09 10:30:10 -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	a8d090d5a2	Merge branch 'master' into autoreject-on-ban	2017-03-08 17:07:26 -05:00
Riley Davis	ee84b821fc	Merge branch 'master' into mod-squad	2017-03-08 14:57:19 -07:00
David Jay	fac3d26c22	Closing ban dialog after ban is complete.	2017-03-08 16:39:53 -05:00
David Jay	d203a9afe0	Auto-rejecting comments on ban.	2017-03-08 16:06:34 -05:00
David Jay	3c28f68d0a	Merge branch 'master' into mod-squad	2017-03-08 15:32:48 -05:00
David Jay	be3212e144	Merge branch 'master' into banned-optimize-bug	2017-03-08 15:05:12 -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	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
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
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
David Jay	450f1fdbac	Focusing on reply box when reply is clicked.	2017-03-06 13:25:01 -05:00
Riley Davis	5cb7172bbe	Merge branch 'master' ... Conflicts: client/coral-embed-stream/src/Embed.js	2017-03-06 11:01:37 -07:00
Riley Davis	000833509f	remove notification reducer. have parent show notifications	2017-03-06 10:59:12 -07:00
Belen Curcio	e80d6e7b0a	Configure UX Style Polish!	2017-03-06 12:12:26 -05:00
Belen Curcio	6cd75b57dc	border box	2017-03-03 16:18:58 -05:00
David Jay	3280ed9ae5	Merge branch 'master' into premod-links	2017-03-03 16:17:40 -05:00
Belen Curcio	ec4fc566c1	props	2017-03-03 16:15:30 -05:00
David Jay	b9488dc36c	Updating moderation.	2017-03-03 16:09:34 -05:00
David Jay	b912b60428	Removing unecessary log statement.	2017-03-03 16:01:53 -05:00
Belen Curcio	1f0d102115	new components!! textarea stuff and configure bugs	2017-03-03 15:53:53 -05:00
David Jay	2e5d453ea7	Updating link search and adding settings in admin panel.	2017-03-03 15:44:03 -05:00
Belen Curcio	a1a45a7969	Styles and disable and enable things	2017-03-03 15:10:15 -05:00
David Jay	cb88f0a9b7	Flagging links when settings are set appropriately.	2017-03-03 14:32:57 -05:00
Belén Curcio	740aa88958	Merge branch 'master' into 140895223	2017-03-03 13:30:39 -05:00
Belen Curcio	79102de9d2	Star and Coral UI added :D	2017-03-03 13:21:42 -05:00