71 Commits

Author	SHA1	Message	Date
Belén Curcio	10836f7918	Merge branch 'master' into plugin	2017-04-06 17:04:38 -03:00
Chi Vinh Le	7c2b16521a	Merge branch 'master' into plugin ... Conflicts: .eslintignore .gitignore graph/resolvers/index.js plugins.json	2017-04-06 21:22:40 +07:00
Chi Vinh Le	be64905426	Fix graph not importing plugin resolvers	2017-04-06 17:45:34 +07:00
Wyatt Johnson	990fe34873	Merge branch 'master' into support-lazy-assets	2017-04-05 16:21:16 -06:00
Wyatt Johnson	c5ce22c5e6	Fixed for syntax	2017-04-05 14:36:35 -06:00
Chi Vinh Le	b0effe8731	Merge with 'master'	2017-04-06 01:26:48 +07:00
Chi Vinh Le	582f799b6c	Revert "Merge" ... This reverts commit d9835a17d3, reversing changes made to 18d6846f4e.	2017-04-06 00:53:21 +07:00
Belen Curcio	d9835a17d3	Merge	2017-04-05 12:08:07 -03:00
Wyatt Johnson	877372814a	Merge branch 'master' into support-lazy-assets	2017-04-05 08:14:31 -06:00
Wyatt Johnson	52948a4165	Added support for a plugin which disables lazy assets	2017-04-03 16:51:14 -06:00
Wyatt Johnson	0108673566	Added remote plugin reconciliation	2017-03-31 15:54:39 -06:00
Belen Curcio	004e8d5fe9	Using wrapResponse	2017-03-31 12:37:11 -03:00
gaba	84f1d3ece2	Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts.	2017-03-23 16:02:25 -07:00
gaba	7522bd9cd6	Sends a mail to the suspended user.	2017-03-21 15:08:46 -07:00
gaba	be2ecf0838	Adds user and message to flagaction to display in FE.	2017-03-20 13:38:11 -07:00
gaba	2fff47c753	Merge branch 'master' into plugins	2017-03-20 10:46:30 -07:00
David Erwin	abd0b51441	Removing log	2017-03-20 07:42:29 -07:00
gaba	6f3cb34817	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:39:00 -07:00
riley	8348e1e462	Merge branch 'master' into asset-comment-metrics	2017-03-20 07:36:22 -07:00
gaba	258fd8b25a	Initial implementation at plugins	2017-03-20 07:36:06 -07:00
Wyatt Johnson	fcc93963c4	Added support for total comment count	2017-03-20 07:29:08 -07:00
Wyatt Johnson	63220cb6a7	Some fixes to make it work	2017-03-08 19:14:02 -07:00
Wyatt Johnson	feaad2d6ca	Added loader, graphql	2017-03-08 19:01:08 -07:00
gaba	62423e620e	Remove edge on user.	2017-03-07 18:04:50 +01:00
gaba	564b8d8eaa	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-07 13:04:28 +01:00
gaba	d06a5d37f0	Moves to the loader and work on the user query to add pagination and action type.	2017-03-07 07:29:32 +01:00
Belen Curcio	bb05fa5325	Reverse chronos	2017-03-03 13:37:10 -05:00
gaba	2fa832a3f4	adds suspendUser func and mutation.	2017-03-02 15:54:50 -08:00
Wyatt Johnson	a1e2077ef1	Merge branch 'master' into 138617379_best_comments	2017-03-01 09:43:44 -07:00
Benjamin Goering	5cb522c419	Merge branch 'master' into 138617379_best_comments	2017-03-01 20:49:04 +08:00
Benjamin Goering	5e0d01a649	lift findById out of add,removeCommentTag mutators and into root_mutation.js defs	2017-03-01 14:15:31 +08:00
gaba	da3c812dc1	Adds graphql for users flagged in the server and client.	2017-02-28 21:33:01 -08:00
David Jay	e68358a211	Merge branch 'master' into fix-permalink	2017-02-28 18:07:31 -05:00
Riley Davis	ac3e6a12bd	Merge branch 'master' into assets-by-like	2017-02-28 09:27:46 -07:00
Benjamin Goering	30ee80b12c	basic working removeCommentTag mutation	2017-02-28 19:59:33 +08:00
Benjamin Goering	6e338290a1	addCommentTag mutation works	2017-02-28 19:59:32 +08:00
David Jay	ab16e5bfe7	Retrieving comment y id from backend	2017-02-27 14:26:20 -05:00
David Jay	f795a96f46	Returning dontagree id on post.	2017-02-23 13:19:09 -05:00
Wyatt Johnson	2360f280d2	Added commentMetrics edge.	2017-02-21 14:30:52 -07:00
David Jay	0aaa52e01f	Merge branch 'master' into dont-agree	2017-02-21 15:02:33 -05:00
David Jay	1d8ce1ae34	Posting DontAgree actions.	2017-02-21 14:41:33 -05: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
Wyatt Johnson	1e81ec9f4e	Added new commentCount edge, added more docs	2017-02-16 16:49:14 -07:00
Wyatt Johnson	93636aabac	Added like summaries	2017-02-15 16:15:43 -07:00
Wyatt Johnson	e640bc2cc0	Added edge for metrics, fixed client linting errors	2017-02-14 17:02:50 -07:00
Wyatt Johnson	d987b33d99	Merge branch 'master' into flag-widget	2017-02-14 09:00:12 -07:00
Belen Curcio	51be47b62e	added flag functionality	2017-02-13 19:09:26 -03:00
Belen Curcio	594b87208a	GraphQL Review and Responses	2017-02-13 16:00:55 -03:00
Belen Curcio	e2ebac7176	adds new mutations: setCommentStatus	2017-02-13 14:32:48 -03:00