1130 Commits

Author	SHA1	Message	Date
David Jay	761d0aaa3a	Merge branch 'master' into new-comments	2017-02-23 16:21:36 -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
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
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
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
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	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
David Erwin	0563b93d39	Merge branch 'master' into error_translation_key	2017-02-17 20:07:49 -05: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
gaba	5a09beb727	It has to be translation_key and not message.	2017-02-17 10:12:37 -08:00
Belen Curcio	2d374fcdab	Úsing the db url	2017-02-17 15:08:55 -03:00
Belen Curcio	54f0705f0f	Merge branch 'master' of github.com:coralproject/talk into stream-settings	2017-02-17 15:05:17 -03:00
Belén Curcio	98a34892ff	Merge branch 'master' into the-answer-is-42	2017-02-17 14:42:44 -03:00
David Jay	f6a6f443a9	Merge branch 'master' into update-on-post-comment	2017-02-17 12:30:42 -05:00
Belen Curcio	051978a1ee	to the configure	2017-02-17 14:21:47 -03:00
Belen Curcio	761afeaf4f	Stream cog, settings	2017-02-17 14:15:16 -03:00
Belen Curcio	25f366c5f1	Comment Count Component	2017-02-17 13:55:35 -03:00
Belen Curcio	7eca9db63c	null assetIDs and old typo	2017-02-17 13:53:34 -03:00
gaba	dd3435fffe	Replace with translation_key to manage error translation.	2017-02-17 08:42:48 -08:00
David Jay	a35af36ee1	Handling premod in optimistic comment updates.	2017-02-17 11:26:19 -05:00
Belen Curcio	41d0610985	PropTypes	2017-02-17 13:22:41 -03:00
gaba	5370a6f81a	A few more changes from display to username.	2017-02-17 08:05:32 -08:00
David Erwin	8502b43974	Updating more displayname to username	2017-02-17 10:04:15 -05:00
Belén Curcio	e8f711ff9c	Merge branch 'master' into update-on-post-comment	2017-02-17 02:38:22 -03:00
gaba	a903ceb643	Merge branch 'master' into displayNameFORALL	2017-02-16 16:13:36 -08:00
gaba	4765973a58	Other small changes and fix bug because displayname instead displayName...	2017-02-16 16:07:19 -08:00
Riley Davis	f925e6a8ea	fix bug when likes or flags were 0 for an article	2017-02-16 16:49:14 -07:00
Riley Davis	2b4e16edfa	fix bug when likes or flags were 0 for an article	2017-02-16 16:39:02 -07:00
gaba	3166692d4e	Rename everywhere to username.	2017-02-16 15:16:54 -08:00
David Jay	e3e85c5f3b	Fixing error when posting comment.	2017-02-16 17:18:36 -05:00
Riley Davis	1bda098045	Merge branch 'master' into the-answer-is-42	2017-02-16 13:41:01 -07:00
David Erwin	24f052024d	Merge branch 'master' into update-on-post-comment	2017-02-16 15:40:51 -05:00
Riley Davis	c53aa1d93b	add a badge to the queues to show the count. proptypes	2017-02-16 12:48:36 -07:00
Riley Davis	1dcdd4a9c9	make Dashboard first tab per Sam. simplify tabs	2017-02-16 12:04:24 -07:00