2085 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wyatt Johnson	27819d0d6a	Changed aggregate -> find	2017-02-15 17:42:54 -07:00
Wyatt Johnson	b75aed8bd8	Another optimization pass	2017-02-15 17:28:47 -07:00
Wyatt Johnson	9eefc0299f	Optimization pass	2017-02-15 17:12:17 -07: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
Wyatt Johnson	93636aabac	Added like summaries	2017-02-15 16:15:43 -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 ErwinandGitHub	a37e103e87	Merge pull request #315 from coralproject/flags-button ... Admin actions for Flagged comments	2017-02-15 15:48:32 -05:00
Belen Curcio	1796efd3ba	Ádding NONE to the FE	2017-02-15 17:34:29 -03:00
Belen Curcio	0778b7832f	Merge branch 'flags-button' of github.com:coralproject/talk into flags-button	2017-02-15 17:33:30 -03:00
Belen Curcio	675f823849	no comments endpoints in /admin 🎉	2017-02-15 17:32:54 -03:00
Wyatt Johnson	57d4f9d757	Changed new comment's status from null to NONE.	2017-02-15 13:21:15 -07: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
Belén CurcioandGitHub	5b16df44ed	Merge branch 'master' into flags-button	2017-02-15 16:33:53 -03:00
Belen Curcio	ed105f876e	not Accepted ones in the Flagged queue	2017-02-15 16:19:31 -03:00
David ErwinandGitHub	0747219c63	Merge pull request #306 from coralproject/load-more-comments ... Load more comments	2017-02-15 14:11:16 -05:00
Belen Curcio	e59534bf46	merge confict	2017-02-15 16:09:04 -03:00
David Jay	1cad1d36d5	Updating asset_id to camelcase.	2017-02-15 13:26:56 -05: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	63982aa241	add PropTypes to LoadMore component	2017-02-14 15:27:36 -07:00
Riley Davis	0bef413a3a	saving my place	2017-02-14 15:20:28 -07:00
David JayandGitHub	714c251c77	Merge branch 'master' into load-more-comments	2017-02-14 17:02:32 -05:00
David ErwinandGitHub	d4651d4a2f	Merge pull request #312 from coralproject/disable-e2e-ci ... Comment out e2e in ci	2017-02-14 17:01:46 -05:00
David Erwin	06422d7074	Comment out e2e in ci	2017-02-14 16:56:55 -05:00
David JayandGitHub	e95372373c	Merge branch 'master' into load-more-comments	2017-02-14 16:35:44 -05:00
David Erwin	b76f3bbf91	Merge branch 'all-flag' ... t push origin master	2017-02-14 16:31:01 -05:00
David Jay	a07b98dcc4	Updating logout path.	2017-02-14 16:16:40 -05:00
David Jay	85ea41725a	Increasing logout button load time.	2017-02-14 16:03:38 -05:00
David Jay	f524f539da	Increasing logout time.	2017-02-14 15:53:40 -05:00
David Jay	b497dc2286	Merge branch 'master' of github.com:coralproject/talk into load-more-comments	2017-02-14 15:42:32 -05:00
David Jay	c3fe9fb43e	Commenting out brittle e2e test.	2017-02-14 15:41:25 -05:00
Belén CurcioandGitHub	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 ErwinandGitHub	daec809d87	Merge pull request #307 from coralproject/external-css-file ... Configure override css file	2017-02-14 13:58:05 -05:00
David ErwinandGitHub	ce2213549b	Merge branch 'master' into external-css-file	2017-02-14 13:40:22 -05:00
David ErwinandGitHub	d2c9b4b7a7	Merge pull request #310 from coralproject/close-time-bug ... fix Configure in admin	2017-02-14 13:40:07 -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
David Jay	330c37ef86	Merge branch 'load-more-comments' of github.com:coralproject/talk into load-more-comments	2017-02-14 12:27:17 -05:00
David Jay	03a198a867	Adding View More translation.	2017-02-14 12:25:39 -05:00
David JayandGitHub	6b4ea14ce2	Merge branch 'master' into load-more-comments	2017-02-14 12:00:12 -05:00
Wyatt Johnson	d987b33d99	Merge branch 'master' into flag-widget	2017-02-14 09:00:12 -07:00
David ErwinandGitHub	d1749e0f35	Merge branch 'master' into external-css-file	2017-02-14 09:59:37 -05:00