1031 Commits

Author	SHA1	Message	Date
Belén Curcio	5b16df44ed	Merge branch 'master' into flags-button	2017-02-15 16:33:53 -03: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
Riley Davis	63982aa241	add PropTypes to LoadMore component	2017-02-14 15:27:36 -07:00
David Jay	e95372373c	Merge branch 'master' into load-more-comments	2017-02-14 16:35:44 -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
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
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
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 Jay	6b4ea14ce2	Merge branch 'master' into load-more-comments	2017-02-14 12:00:12 -05: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
David Jay	edc3671839	Updating load-more-comments style.	2017-02-13 19:32:39 -05:00
David Jay	7d617ca611	Merge branch 'master' of github.com:coralproject/talk into load-more-comments	2017-02-13 18:26:05 -05: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
David Jay	c756b22302	Switching Load More to stateless component.	2017-02-13 15:15:27 -05:00
Belen Curcio	732ef9b8bd	Adding moderationList for the tests	2017-02-13 16:24:12 -03:00
Belen Curcio	0403c46c6c	Adding errors response	2017-02-13 16:13:03 -03:00
Belen Curcio	594b87208a	GraphQL Review and Responses	2017-02-13 16:00:55 -03:00
David Jay	03b73d8d6d	Merge branch 'master' into load-more-comments	2017-02-13 12:45:25 -06:00
David Jay	5b2f52a283	Restyling Load More button.	2017-02-13 13:22:50 -05:00
Wyatt Johnson	e494cbd7e8	Merge branch 'master' into username-displayname	2017-02-13 11:17:29 -07:00
riley	ba51b0742f	remove non-breaking space and add css	2017-02-13 11:00:28 -07:00
Riley Davis	5a0af59c45	add a non-breaking space in between username and pubdate	2017-02-13 10:53:03 -07: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
David Jay	4fedb7f31e	Merge branch 'master' of github.com:coralproject/talk into load-more-comments	2017-02-10 14:34:19 -08:00
gaba	e2e40ca2b3	Merge branch 'master' into story-137818425-tag-staff	2017-02-10 13:42:50 -08:00
gaba	11ef12c14c	Adds padding and resolves when is not staff.	2017-02-10 13:33:57 -08:00
Belen Curcio	894fec9fb6	adding context for moderation	2017-02-10 17:55:51 -03:00
Riley Davis	81a408a0b1	fix very annoying Like bug	2017-02-10 13:21:58 -07:00
Belen Curcio	bc14b908eb	banUsers and moderate separate streams, not found assets etc	2017-02-10 17:15:26 -03:00
gaba	71fcf9cd3f	FE for the Staff Tag. Modifed typedfs graphql.	2017-02-10 10:20:34 -08:00
Riley Davis	27ea409e31	html things	2017-02-10 10:52:55 -07:00
David Jay	05fcc61c9c	Resolving bug on comment load.	2017-02-09 17:56:28 -08:00
David Jay	52099efed9	Updating format of returned comments in CommentBox.	2017-02-09 17:27:16 -08:00