449 Commits

Author	SHA1	Message	Date
Gabriela Rodríguez Berón	31dda920c6	Merge branch 'master' into error_translation_key	2017-02-17 14:30:00 -08: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
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
Belen Curcio	41d0610985	PropTypes	2017-02-17 13:22:41 -03: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
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
David Erwin	5467d980df	Merge branch 'master' into sory-139595043-qbox	2017-02-16 11:26:22 -05:00
Riley Davis	6c141cbce0	now with likes	2017-02-15 16:52:06 -07:00
Wyatt Johnson	56fe8ef08e	Merge branch 'master' into flag-widget	2017-02-15 16:17:30 -07:00
Riley Davis	f91607cff9	show the author and publication date	2017-02-15 15:36:46 -07:00
Riley Davis	b3b36a245a	even more translations en Español	2017-02-15 14:23:54 -07:00
riley	b26c170a52	add some translations and link to mod queue	2017-02-15 14:11:44 -07:00
David Erwin	8a3309da92	Merge branch 'master' into sory-139595043-qbox	2017-02-15 15:50:42 -05:00
Belen Curcio	1796efd3ba	Ádding NONE to the FE	2017-02-15 17:34:29 -03:00
Belen Curcio	675f823849	no comments endpoints in /admin 🎉	2017-02-15 17:32:54 -03:00
Riley Davis	efb529d7bd	Merge branch 'master' ... Conflicts: client/coral-admin/src/AppRouter.js	2017-02-15 13:03:19 -07:00
Riley Davis	6eda495663	display most flagged assets in a table	2017-02-15 12:57:51 -07:00
gaba	68c764fd43	Rename coral-ui/FormField with TextField.	2017-02-15 11:50:21 -08:00
Belen Curcio	ed105f876e	not Accepted ones in the Flagged queue	2017-02-15 16:19:31 -03:00
Belen Curcio	e59534bf46	merge confict	2017-02-15 16:09:04 -03:00
Belen Curcio	417edc81ca	Admin actions for flagged comments	2017-02-15 13:40:01 -03:00
Wyatt Johnson	e640bc2cc0	Added edge for metrics, fixed client linting errors	2017-02-14 17:02:50 -07:00
Riley Davis	50e3e733c3	create FlagWidget	2017-02-14 16:12:38 -07:00
Riley Davis	0bef413a3a	saving my place	2017-02-14 15:20:28 -07:00
Belén Curcio	023ba74c8f	Merge branch 'master' into all-flag	2017-02-14 16:34:44 -03:00
Belen Curcio	41a1eeda26	Removing all code	2017-02-14 16:10:08 -03:00
Belen Curcio	bbb82b6a77	New static routes <3 for global and single assets, also, deprecating the all view	2017-02-14 16:06:13 -03:00
Riley Davis	5e2c1a9d4f	Merge branch 'master' ... Conflicts: client/coral-admin/src/translations.json	2017-02-14 12:03:54 -07:00
David Erwin	ce2213549b	Merge branch 'master' into external-css-file	2017-02-14 13:40:22 -05:00
Riley Davis	53e3147290	properly save settings to server	2017-02-14 11:29:40 -07:00
Riley Davis	fe1aaba9ed	revert state shape to what it was before	2017-02-14 11:05:39 -07:00
Wyatt Johnson	d987b33d99	Merge branch 'master' into flag-widget	2017-02-14 09:00:12 -07:00
David Erwin	d1749e0f35	Merge branch 'master' into external-css-file	2017-02-14 09:59:37 -05:00
Belen Curcio	f07900b294	Missing reducer	2017-02-14 11:44:22 -03:00
Riley Davis	86d0e59147	add translation to input label	2017-02-13 16:09:06 -07:00
Riley Davis	183d2e1ea0	Merged branch master into external-css-file	2017-02-13 16:04:00 -07:00
Riley Davis	0234112ad0	enable configuration for linking override stylesheets	2017-02-13 16:03:49 -07:00
Wyatt Johnson	51cbf79f30	Changed fragment	2017-02-13 15:33:10 -07:00
Belen Curcio	8953182329	merge	2017-02-13 19:14:27 -03:00
Belen Curcio	51be47b62e	added flag functionality	2017-02-13 19:09:26 -03:00
Belen Curcio	37ba14f3b5	breaking big words	2017-02-13 18:27:26 -03:00
Belen Curcio	519298b980	Design Pass	2017-02-13 18:12:37 -03:00
Belen Curcio	732ef9b8bd	Adding moderationList for the tests	2017-02-13 16:24:12 -03:00