95 Commits

Author	SHA1	Message	Date
Belén Curcio	f30275e375	Merge branch 'master' into 138617379_best_comments	2017-03-03 09:51:25 -05:00
David Jay	06f9c12f5e	Updating comment count.	2017-03-02 13:11:16 -05:00
David Jay	609af767e8	Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink	2017-03-02 13:04:32 -05:00
David Jay	acda388d4e	Updating e2e tests.	2017-03-02 13:00:54 -05:00
Wyatt Johnson	ec09f1ca44	Merge branch 'master' into 138617379_best_comments	2017-03-01 16:47:03 -07:00
Wyatt Johnson	57fc4b8a3f	Fixed test	2017-03-01 16:40:47 -07:00
Benjamin Goering	5cb522c419	Merge branch 'master' into 138617379_best_comments	2017-03-01 20:49:04 +08:00
Benjamin Goering	405dac292c	Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version)	2017-03-01 13:43:39 +08:00
Benjamin Goering	378622f7e8	commentTag mutation tests await SettingsService	2017-03-01 12:46:35 +08:00
Benjamin Goering	d9df38fc3a	fix e2e tests with .comment selector that avoids hidden dialog	2017-02-28 20:00:41 +08:00
Benjamin Goering	f8479a8661	fix e2e tests with .comment selector that avoids hidden dialog	2017-02-28 20:00:41 +08:00
Benjamin Goering	96d1447602	remove debugging code from embedStreamPage	2017-02-28 19:59:35 +08:00
Benjamin Goering	bce84f24fd	Embed can remove best tag	2017-02-28 19:59:33 +08:00
Benjamin Goering	98f3033326	Add permission checking to addCommentTag,removeCommentTag	2017-02-28 19:59:33 +08:00
Benjamin Goering	30ee80b12c	basic working removeCommentTag mutation	2017-02-28 19:59:33 +08:00
Benjamin Goering	4ff6bce8ec	Add ComentsService#removeTag	2017-02-28 19:59:33 +08:00
Benjamin Goering	1bb20923a2	Fix Commenter/BestCommentTest to postComment before checking things.	2017-02-28 19:59:32 +08:00
Benjamin Goering	6e338290a1	addCommentTag mutation works	2017-02-28 19:59:32 +08:00
Benjamin Goering	907c4526da	BestButton only shows if currentUser can use it (and e2e)	2017-02-28 19:57:50 +08:00
Benjamin Goering	a26a60cc67	minial best button uionly and e2e	2017-02-28 19:57:50 +08:00
Wyatt Johnson	799727264e	Removed log	2017-02-24 09:57:57 -07:00
Wyatt Johnson	f5277ce5e3	Patched silly bug	2017-02-24 09:57:24 -07:00
Riley Davis	5d1139dbdd	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2017-02-24 08:49:30 -07:00
Wyatt Johnson	9e759c7667	Adjusted BE beheviour	2017-02-22 13:55:48 -07:00
David Jay	9149b737f5	Retrieving counts and displaying new comments to user.	2017-02-21 17:23:09 -05:00
Wyatt Johnson	4cccf09a87	spelling...	2017-02-17 15:53:23 -07: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
gaba	3166692d4e	Rename everywhere to username.	2017-02-16 15:16:54 -08:00
Wyatt Johnson	57d4f9d757	Changed new comment's status from null to NONE.	2017-02-15 13:21:15 -07: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	c3fe9fb43e	Commenting out brittle e2e test.	2017-02-14 15:41:25 -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
David Jay	1af25bb2a7	Updating mocks.	2017-02-13 16:29:56 -05: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
gaba	498eb5eb91	Fix the test.	2017-02-10 12:06:36 -08:00
gaba	c80f406b21	Add tests	2017-02-10 11:52:02 -08:00
Wyatt Johnson	3cd2b28bc2	Inital rename of displayName -> username	2017-02-09 16:48:59 -07:00
Wyatt Johnson	fb9bedc57b	Added new action rep, refactored mutations	2017-02-08 17:41:11 -07:00
gaba	1176a94bec	Update tests	2017-02-07 15:36:10 -08:00
Gabriela Rodríguez Berón	5b609ceb86	Merge branch 'master' into story-138524853-domain-whitelist	2017-02-07 14:20:48 -08:00
gaba	3effd11ad2	Adding test.	2017-02-07 13:57:46 -08:00
David Jay	652170735b	Merge branch 'master' into username-ban	2017-02-06 18:14:13 -08:00
Riley Davis	8c8a8eb3b8	define more propTypes. add a second button so tests work	2017-02-06 16:23:00 -07:00
Riley Davis	fe6d6f611d	pause suddenly not a function?	2017-02-06 14:59:23 -07:00
Riley Davis	93ee5bfc4a	just throwing stuff at the wall to see what sticks	2017-02-06 14:42:40 -07:00
Riley Davis	3a145e9927	add a pause to see if anything changes	2017-02-06 14:22:37 -07:00