68 Commits

Author	SHA1	Message	Date
gaba	f51c857e8b	Merge branch 'master' into sory-139595043-qbox	2017-02-14 08:51:58 -08:00
Belen Curcio	8953182329	merge	2017-02-13 19:14:27 -03:00
gaba	f9f32b1ef6	Merge branch 'master' into sory-139595043-qbox	2017-02-13 14:13:28 -08:00
gaba	1b788b98c6	Adds questionBox to the gl query	2017-02-13 14:12:32 -08: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
Belen Curcio	90ed1f1056	Ban user with graphql, 100 refactor	2017-02-13 11:50:16 -03:00
Wyatt Johnson	de54433c5c	Merge branch 'master' into username-displayname	2017-02-10 16:19:27 -07:00
gaba	e2e40ca2b3	Merge branch 'master' into story-137818425-tag-staff	2017-02-10 13:42:50 -08:00
Belen Curcio	894fec9fb6	adding context for moderation	2017-02-10 17:55:51 -03:00
Belen Curcio	bc14b908eb	banUsers and moderate separate streams, not found assets etc	2017-02-10 17:15:26 -03:00
Wyatt Johnson	c637be364a	Moved tag creation into mutator	2017-02-10 12:00:50 -07:00
Gabriela Rodríguez Berón	7325525716	Merge branch 'master' into story-137818425-tag-staff	2017-02-10 10:32:43 -08:00
gaba	71fcf9cd3f	FE for the Staff Tag. Modifed typedfs graphql.	2017-02-10 10:20:34 -08:00
Wyatt Johnson	2c2541e7be	Added fix for not logged in user	2017-02-10 11:00:12 -07:00
David Jay	b4ee765437	Merge branch 'master' into actions	2017-02-09 17:14:53 -08:00
Wyatt Johnson	3cd2b28bc2	Inital rename of displayName -> username	2017-02-09 16:48:59 -07:00
gaba	647ae2fca0	Assigned by will be a string for now.	2017-02-09 14:25:35 -08:00
gaba	1c26e64c71	Adds Tags to the graphql.	2017-02-09 12:23:40 -08:00
Wyatt Johnson	fb9bedc57b	Added new action rep, refactored mutations	2017-02-08 17:41:11 -07:00
Riley Davis	d4d1f088cd	Merge branch 'master' into recent-items	2017-02-08 14:50:06 -07:00
Wyatt Johnson	7bef103217	Added new recentComments, recentReplies	2017-02-06 12:54:55 -07:00
David Jay	6e92f8c3d6	Merge branch 'master' of github.com:coralproject/talk into username-ban	2017-02-03 10:19:21 -08:00
David Jay	feb0860ba1	Merge branch 'master' of github.com:coralproject/talk into username-ban	2017-02-02 12:29:29 -05:00
David Erwin	79a2a2144c	Fix admin user stream bug	2017-02-02 11:51:09 -05:00
David Jay	5831a6f927	Merge branch 'master' of github.com:coralproject/talk into username-ban	2017-02-01 20:00:54 -05:00
David Jay	d703cc2168	Prompting user to update name when banned.	2017-02-01 19:53:37 -05:00
David Jay	b2430eaf60	Adding displayname editing and appropriate toggle.	2017-02-01 15:55:33 -05:00
riley	00297d1a1a	fix a bug per wyatt advice	2017-02-01 11:22:42 -07:00
Wyatt Johnson	d1cf6fd19b	Applied patch	2017-02-01 10:45:01 -07:00
Wyatt Johnson	04cd7312a6	Added support for new commentCount	2017-01-27 15:52:05 -07:00
Wyatt Johnson	2e6c7f7b09	First pass at pagination	2017-01-27 12:05:19 -07:00
David Jay	02ece80227	Marking correct user as Pending on user flags.	2017-01-26 17:42:45 -05:00
David Jay	f06edec6a2	Merge branch 'master' of github.com:coralproject/talk into moderate-bio	2017-01-26 16:38:43 -05:00
David Jay	06331d3c07	Updating bio moderation to graphQL architecture.	2017-01-26 15:31:15 -05:00
Wyatt Johnson	0035037583	Merge branch 'master' into graphql-abstraction	2017-01-25 14:32:52 -07:00
Wyatt Johnson	693e92a627	Moved the graphql file out of the string	2017-01-25 14:31:11 -07:00
Wyatt Johnson	373f119ac2	Added more comment sorting	2017-01-24 17:22:29 -07:00
Wyatt Johnson	eb469df573	Removed debugging tool	2017-01-24 17:08:12 -07:00
Wyatt Johnson	26b7d48f1f	Comment ordering fixed, banned users can't do anything	2017-01-24 17:06:40 -07:00
Wyatt Johnson	b6d917a22b	fixed translation key, enforced moderation setting schema	2017-01-24 16:08:13 -07:00
Belen Curcio	9edf99730d	Status	2017-01-24 18:21:49 -03:00
Wyatt Johnson	0a5a23c1f3	Added fixes for tests on CI	2017-01-24 13:45:06 -07:00
Belen Curcio	ee9674cd23	Settings stream tab	2017-01-24 17:27:30 -03:00
Wyatt Johnson	9dc57c82d1	Fixes to consts + services	2017-01-24 13:27:22 -07:00
Belen Curcio	5750758cf1	Error with asset resolver	2017-01-24 17:27:05 -03:00
David Jay	88ed6ffe76	Updating logic for returning users to frontend.	2017-01-24 15:20:27 -05:00
Wyatt Johnson	aa1f06d1ee	Added explicit joinBy to dataLoader reponse	2017-01-24 13:12:51 -07:00
Wyatt Johnson	3a59a785f8	Uppercased status's	2017-01-24 12:58:20 -07:00