1331 Commits

Author	SHA1	Message	Date
Belen Curcio	dc96b550a6	Button should inherit font	2017-03-07 14:56:28 -05: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
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	09556c9bef	indention	2017-03-06 14:06:32 -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
Belen Curcio	5da1af8387	Styles ready!	2017-03-03 13:00:22 -05:00
Belen Curcio	d218979ee6	Show Story, show and hide Moderate	2017-03-03 11:46:09 -05:00
Kim Gardner	b5653eca2d	Merge branch 'master' into keyboard-shortcuts	2017-03-03 09:59:45 -05:00
Belén Curcio	f30275e375	Merge branch 'master' into 138617379_best_comments	2017-03-03 09:51:25 -05:00
David Jay	b92ea72b78	Re-enabling premod links in settings.	2017-03-02 16:44:36 -05:00
Riley Davis	e3f6327b86	messages show up	2017-03-02 14:43:26 -07:00
Kim Gardner	da6d5d58b3	Merge branch 'master' into bugfix-e2e-permalink	2017-03-02 16:26:54 -05:00
David Jay	57a7000e59	Animating transition in mod queue.	2017-03-02 16:08:24 -05:00
David Jay	d554bf5211	Adding single view and restyling selected comment.	2017-03-02 16:03:18 -05:00
David Jay	1146f22613	Accepting and rejecting comments w/ keystrokes.	2017-03-02 15:41:51 -05:00
David Jay	78be17ec6d	Adding keyboard selection of comments.	2017-03-02 15:19:33 -05:00
David Jay	7be3b05f22	Re-enabling keyboard shortcut menu.	2017-03-02 14:51:51 -05:00
Riley Davis	a6c7fe85b9	remove querySelector call	2017-03-02 12:34:10 -07:00
Riley Davis	2246728c80	only trigger a re-flow when the height actually changes	2017-03-02 12:27:31 -07:00
David Jay	609af767e8	Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink	2017-03-02 13:04:32 -05:00
David Jay	acda388d4e	Updating e2e tests.	2017-03-02 13:00:54 -05:00
Wyatt Johnson	ec09f1ca44	Merge branch 'master' into 138617379_best_comments	2017-03-01 16:47:03 -07:00
Wyatt Johnson	23540cb2c2	Merge branch 'master' into asset-name-fixes	2017-03-01 16:43:25 -07:00
Wyatt Johnson	e08d737a69	Merge branch 'master' into asset-name-fixes	2017-03-01 16:42:37 -07:00
Kim Gardner	ca635a34cc	Merge branch 'master' into move-config-around	2017-03-01 18:39:09 -05:00
Wyatt Johnson	cefe872bf0	Fixed queries	2017-03-01 16:38:27 -07:00
Riley Davis	5aabf2b177	Merge branch 'master' into move-config-around	2017-03-01 16:36:31 -07:00
Riley Davis	a839596c20	Merge branch 'master' into reply-no-reply	2017-03-01 16:34:42 -07:00
Riley Davis	ed0df4b738	make sure reply box works	2017-03-01 16:32:01 -07:00
Riley Davis	fa5a94c4be	add some missing translations	2017-03-01 16:00:42 -07:00
Wyatt Johnson	3d13380fcc	Touched up embed + stream query	2017-03-01 15:49:39 -07:00
riley	c4edbd4db4	removing dead code	2017-03-01 15:28:44 -07:00