1123 Commits

Include renames

Author	SHA1	Message	Date
Riley Davis	2f314c6937	omg, a bunch of UI madness	2017-02-23 14:29:51 -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
Riley Davis	111b956522	change index route to Dashboard component	2017-02-22 13:10:50 -07: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
Riley DavisandGitHub	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	364cf1808e	assets by like?	2017-02-21 10:28:33 -07:00
David ErwinandGitHub	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ónandGitHub	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 ErwinandGitHub	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 CurcioandGitHub	98a34892ff	Merge branch 'master' into the-answer-is-42	2017-02-17 14:42:44 -03:00
David JayandGitHub	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 CurcioandGitHub	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 DavisandWyatt Johnson	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 DavisandGitHub	1bda098045	Merge branch 'master' into the-answer-is-42	2017-02-16 13:41:01 -07:00
David ErwinandGitHub	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
gaba	8e14c1986d	Adds icon and style to the question box.	2017-02-16 10:33:28 -08:00
Belén CurcioandGitHub	501e65f729	Merge branch 'master' into update-on-post-comment	2017-02-16 13:36:39 -03:00
David ErwinandGitHub	ca1d9a04f6	Merge branch 'master' into load-more-replies	2017-02-16 11:31:32 -05:00
David ErwinandGitHub	5467d980df	Merge branch 'master' into sory-139595043-qbox	2017-02-16 11:26:22 -05:00
David ErwinandGitHub	04c0d42278	Merge branch 'master' into update-on-post-comment	2017-02-16 11:26:11 -05:00
Riley Davis	6c141cbce0	now with likes	2017-02-15 16:52:06 -07:00
Wyatt JohnsonandGitHub	56fe8ef08e	Merge branch 'master' into flag-widget	2017-02-15 16:17:30 -07:00