1155 Commits

Author	SHA1	Message	Date
Riley Davis	dc5f95ec7f	simplify moderationqueue	2017-02-24 08:50:52 -07:00
Riley Davis	5d1139dbdd	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2017-02-24 08:49:30 -07:00
Riley Davis	be25d6f56d	"works"	2017-02-23 15:46:44 -07:00
David Jay	b150668d86	Merge branch 'comment-design-pass' of github.com:coralproject/talk into comment-design-pass	2017-02-23 17:11:21 -05:00
David Jay	39536046c9	Fixing permalink icon and adding padding to comment content.	2017-02-23 17:08:35 -05:00
David Jay	e735fb800a	Updating button and signin style.	2017-02-23 17:02:35 -05:00
Riley Davis	2f314c6937	omg, a bunch of UI madness	2017-02-23 14:29:51 -07:00
David Jay	66ef4e38a8	Merge branch 'master' into comment-design-pass	2017-02-23 16:28:20 -05:00
David Jay	2456fe5145	Merge branch 'master' into comment-design-pass	2017-02-23 16:22:35 -05:00
David Jay	761d0aaa3a	Merge branch 'master' into new-comments	2017-02-23 16:21:36 -05:00
David Jay	c1e3aec181	Updating styles.	2017-02-23 16:20:20 -05:00
Kim Gardner	532f2d92ca	Merge branch 'master' into empty-states	2017-02-23 16:15:05 -05:00
David Jay	3e2634be76	Merge branch 'master' into new-comments	2017-02-23 16:11:01 -05:00
David Jay	4cc3426af4	Adding bolding, adding translations to settings page.	2017-02-23 16:07:41 -05:00
David Jay	471607403c	Switching font.	2017-02-23 15:26:02 -05:00
David Jay	d73a6a87a4	Adding border radius to tag label.	2017-02-23 15:19:38 -05:00
David Jay	da732ece14	Updating button padding and font size.	2017-02-23 15:03:09 -05:00
Riley Davis	e3b9799d4a	nested ternaries hurt me	2017-02-23 09:58:31 -07:00
Riley Davis	7ae81fd172	fixing mixed types	2017-02-23 09:43:50 -07:00
Riley Davis	953c749bd2	show login page instead of communicorn :'(	2017-02-22 16:14:14 -07:00
Riley Davis	197569714b	Merged branch assets-by-like into assets-by-like	2017-02-22 14:25:19 -07:00
Wyatt Johnson	9e759c7667	Adjusted BE beheviour	2017-02-22 13:55:48 -07:00
Riley Davis	e6b78a3e63	change some copy	2017-02-22 13:33:50 -07:00
David Jay	27bd1404b3	Adding es translation.	2017-02-22 15:13:46 -05:00
David Jay	bb0b3f461a	Moving polling interval to constant.	2017-02-22 15:11:50 -05:00
Riley Davis	111b956522	change index route to Dashboard component	2017-02-22 13:10:50 -07:00
David Jay	6becb88b56	Adding style to new comments button.	2017-02-22 15:07:32 -05:00
David Jay	096bd12df6	Loading new comments.	2017-02-22 13:45:02 -05:00
Riley Davis	2acd099f3f	add empty state for asset search	2017-02-22 11:15:13 -07:00
David Jay	dd09ddf968	Adding NewCount component.	2017-02-22 13:13:25 -05:00
Riley Davis	691d001213	simplify a bit	2017-02-22 10:49:48 -07:00
Riley Davis	bc48496327	add most liked comments widget	2017-02-22 10:47:23 -07:00
Gabriela Rodríguez Berón	b29614256b	Merge branch 'master' into empty-states	2017-02-22 08:13:44 -08:00
Riley Davis	e7c4acde4d	small bugfix	2017-02-21 16:11:56 -07:00
David Jay	ca107afb9b	Avoiding new comment button when a comment is posted.	2017-02-21 17:29:58 -05:00
David Jay	9149b737f5	Retrieving counts and displaying new comments to user.	2017-02-21 17:23:09 -05:00
Riley Davis	30fbcd30a9	Merge branch 'master' into assets-by-like	2017-02-21 14:18:22 -07:00
Riley Davis	f32fe2629c	css is the worst	2017-02-21 14:16:02 -07:00
Riley Davis	5d94a98305	Like and Flag summaries work again	2017-02-21 14:05:49 -07:00
Riley Davis	f76befd6ac	no comments in user list	2017-02-21 12:48:01 -07:00
Riley Davis	9000778d8f	empty result for users in Community	2017-02-21 12:39:29 -07:00
Riley Davis	e24a0caa20	add EmptyCard component. fix typos. more PropTypes.	2017-02-21 12:08:02 -07:00
Riley Davis	364cf1808e	assets by like?	2017-02-21 10:28:33 -07:00
David Erwin	0563b93d39	Merge branch 'master' into error_translation_key	2017-02-17 20:07:49 -05:00
Riley Davis	8866366d3c	storing my place in case we want to come back to this	2017-02-17 16:07:34 -07:00
Gabriela Rodríguez Berón	31dda920c6	Merge branch 'master' into error_translation_key	2017-02-17 14:30:00 -08:00
gaba	9f168e627a	It uses message and not translation key.	2017-02-17 14:19:30 -08:00
Riley Davis	2506442453	toISOString	2017-02-17 14:10:21 -07:00
Riley Davis	6eb4725dd9	remove ternary from return statement	2017-02-17 14:03:37 -07:00
David Erwin	5d1bc5fb5a	Merge branch 'master' into update-on-post-comment	2017-02-17 13:52:25 -05:00