2210 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Riley Davis	2a0f4906a7	Merged branch assets-by-like into assets-by-like	2017-02-23 15:23:15 -07:00
Wyatt Johnson	30b6259e87	Patched bug with asset metrics	2017-02-23 14:43:25 -07:00
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	5ef5a01f59	Merged branch master into assets-by-like	2017-02-22 11:15:35 -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
Wyatt Johnson	6398e2faad	Fixed issue with comment hydration	2017-02-22 09:32:51 -07:00
Wyatt Johnson	07a956e582	Merge pull request #333 from coralproject/rest-depreciation ... Cleaned up some routes	2017-02-22 08:13:02 -07:00
Wyatt Johnson	d7a6bf9e1f	Cleaned up some routes	2017-02-21 15:24:44 -07:00
Wyatt Johnson	2360f280d2	Added commentMetrics edge.	2017-02-21 14:30:52 -07: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	364cf1808e	assets by like?	2017-02-21 10:28:33 -07:00
David Erwin	17813e23a9	Merge pull request #327 from coralproject/error_translation_key ... Error translation key	2017-02-17 20:13:11 -05:00
David Erwin	0563b93d39	Merge branch 'master' into error_translation_key	2017-02-17 20:07:49 -05:00
David Erwin	df53b101ab	Merge pull request #316 from coralproject/update-on-post-comment ... Apollo update on post comment	2017-02-17 20:07:40 -05:00
David Erwin	6f17a84097	Merge branch 'master' into update-on-post-comment	2017-02-17 20:02:41 -05:00
Wyatt Johnson	09513c0e83	Merge pull request #329 from coralproject/docker-fixx ... Added yarn.lock to Dockerfile	2017-02-17 18:02:26 -07:00
Wyatt Johnson	301c8e829f	Added production flag back	2017-02-17 17:56:44 -07:00
Wyatt Johnson	afcdacff0d	Added yarn.lock to Dockerfile	2017-02-17 17:49:59 -07:00
Riley Davis	8866366d3c	storing my place in case we want to come back to this	2017-02-17 16:07:34 -07:00
David Erwin	a8396481f9	Merge pull request #328 from coralproject/graph-tests ... Initial graph tests	2017-02-17 18:01:17 -05:00
Wyatt Johnson	4cccf09a87	spelling...	2017-02-17 15:53:23 -07:00
Wyatt Johnson	3e4dc9c8b2	Merge branch 'master' into graph-tests	2017-02-17 15:50:21 -07:00
Wyatt Johnson	a00befafcb	Initial graph tests	2017-02-17 15:48:46 -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
David Erwin	62ee81e5a9	Merge pull request #326 from coralproject/stream-settings ... Stream Settings	2017-02-17 13:51:26 -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
David Erwin	c92e336c7f	Merge pull request #321 from coralproject/the-answer-is-42 ... Counts on Mod Queues	2017-02-17 13:00:24 -05: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
Gabriela Rodríguez Berón	bf387af586	Merge pull request #325 from coralproject/displayNameFORALL ... From displayName to username everywhere	2017-02-17 09:24:38 -08: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