Commit Graph
117 Commits
Author SHA1 Message Date
Riley Davis 5cb7172bbe Merge branch 'master'
Conflicts:
	client/coral-embed-stream/src/Embed.js
2017-03-06 11:01:37 -07:00
Riley Davis 000833509f remove notification reducer. have parent show notifications 2017-03-06 10:59:12 -07:00
Riley Davis e3f6327b86 messages show up 2017-03-02 14:43:26 -07:00
Wyatt JohnsonandGitHub ec09f1ca44 Merge branch 'master' into 138617379_best_comments 2017-03-01 16:47:03 -07:00
Riley Davis ed0df4b738 make sure reply box works 2017-03-01 16:32:01 -07:00
Wyatt JohnsonandGitHub eb8b733ac7 Merge branch 'master' into 138617379_best_comments 2017-03-01 11:46:04 -07:00
David JayandGitHub 3b04dab0d5 Merge branch 'master' into bugfix-user-state 2017-03-01 12:57:40 -05:00
Wyatt JohnsonandGitHub a1e2077ef1 Merge branch 'master' into 138617379_best_comments 2017-03-01 09:43:44 -07:00
David Jay fed28b3eec Refetching on login and logout. 2017-02-28 16:13:51 -05:00
David Jay 62fe63d323 Scrolling to permalinked comment or reply. 2017-02-28 14:27:53 -05:00
David Jay 158f31d603 Highlighting permalinked comment. 2017-02-28 13:55:28 -05:00
David Jay bf23fc2974 Moving comment id into query. 2017-02-28 12:02:51 -05:00
Benjamin Goering f8479a8661 fix e2e tests with .comment selector that avoids hidden dialog 2017-02-28 20:00:41 +08:00
Benjamin Goering fc9c67b05c BestButton sends mutations to backend, but they aren't implemented yet 2017-02-28 19:59:32 +08:00
David JayandGitHub 22793c02e2 Merge branch 'master' into dont-agree 2017-02-27 12:29:19 -05:00
Riley Davis 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation 2017-02-24 11:11:18 -07:00
Riley Davis 7ae81fd172 fixing mixed types 2017-02-23 09:43:50 -07:00
David Jay 096bd12df6 Loading new comments. 2017-02-22 13:45:02 -05:00
David Jay dd09ddf968 Adding NewCount component. 2017-02-22 13:13:25 -05:00
David Jay ca107afb9b Avoiding new comment button when a comment is posted. 2017-02-21 17:29:58 -05:00
David Jay 9149b737f5 Retrieving counts and displaying new comments to user. 2017-02-21 17:23:09 -05:00
David JayandGitHub 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
David JayandGitHub f6a6f443a9 Merge branch 'master' into update-on-post-comment 2017-02-17 12:30:42 -05:00
gaba 3166692d4e Rename everywhere to username. 2017-02-16 15:16:54 -08:00
Belén CurcioandGitHub 501e65f729 Merge branch 'master' into update-on-post-comment 2017-02-16 13:36:39 -03:00
David ErwinandGitHub ca1d9a04f6 Merge branch 'master' into load-more-replies 2017-02-16 11:31:32 -05:00
David JayandGitHub 80c60c560a Merge branch 'master' into update-on-post-comment 2017-02-15 17:56:44 -05:00
David Jay 45b419139e Merge branch 'master' of github.com:coralproject/talk into load-more-replies 2017-02-15 17:51:30 -05:00
Gabriela Rodríguez BerónandGitHub a33daea5a3 Merge branch 'master' into sory-139595043-qbox 2017-02-15 11:57:39 -08:00
David Jay 1cad1d36d5 Updating asset_id to camelcase. 2017-02-15 13:26:56 -05:00
David Jay a9104b749c Updating comments and replies using updatequeries w/ optimistic updating. 2017-02-15 12:19:36 -05:00
David Jay 00c2305ff7 Adding view more button to replies. 2017-02-14 18:29:59 -05:00
Riley Davis 63982aa241 add PropTypes to LoadMore component 2017-02-14 15:27:36 -07:00
gaba f51c857e8b Merge branch 'master' into sory-139595043-qbox 2017-02-14 08:51:58 -08:00
David Jay 7d617ca611 Merge branch 'master' of github.com:coralproject/talk into load-more-comments 2017-02-13 18:26:05 -05: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 5a2e4b708b Adds question box 2017-02-13 13:48:03 -08:00
gaba b16bdafc1a Adds plugin for question box. 2017-02-13 12:22:05 -08:00
David Jay c756b22302 Switching Load More to stateless component. 2017-02-13 15:15:27 -05: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
David Jay 05fcc61c9c Resolving bug on comment load. 2017-02-09 17:56:28 -08:00
David Jay 1272dabb4b Updating frontend actions to new format. 2017-02-09 17:01:16 -08:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
Belen Curcio d3184d9afb Merge issues and Settings reducer updated 2017-02-09 13:58:55 -03:00
Riley Davis ddeb28d729 have cursor be the date of the oldest comment 2017-02-08 16:27:09 -07:00
David Jay 0c777cbad4 Adding loadMore function. 2017-02-08 08:59:38 -08:00