Commit Graph

211 Commits

Author SHA1 Message Date
Benjamin Goering 650e8e205e Merge branch 'edit-comment' of github.com:gobengo/talk into edit-comment 2017-05-09 15:03:19 -07:00
Benjamin Goering f37a210479 Only use errors from errors.js for EditWindowHasEnded 2017-05-09 15:02:26 -07:00
Benjamin Goering 8af7168f4f Merge branch 'master' into edit-comment 2017-05-08 19:26:38 -07:00
Wyatt Johnson bc3c73a992 Fix for incorrect options passed to pubsub 2017-05-08 13:26:07 -06:00
Benjamin Goering 096025b72a Add asset_id to editComment mutation to allow mongo query happy path to be atomic 2017-05-08 09:57:52 -07:00
Benjamin Goering b97fa228b1 merge with master after huge coral-embed-stream refactor 2017-05-03 19:19:03 -07:00
Benjamin Goering 0ba973fb44 editComment returns status of comment after edit. UI shows appropriate notifications if PREMOD or REJECTED 2017-05-03 18:05:06 -07:00
Benjamin Goering ae3cbe990b Edit Comment UI reflects expired edit comment window 2017-05-03 12:34:22 -07:00
Wyatt Johnson d9a4653484 Removed LikeAction from core typeName interface resolver 2017-05-03 13:31:57 -06:00
Benjamin Goering b9a3466e2e Edit UI sends editComment mutation, handles errors 2017-05-02 22:07:23 -05:00
Benjamin Goering aa18a433f8 Can't edit comment outside of edit window 2017-05-02 16:47:00 -05:00
Benjamin Goering 756b5f8b45 editComment only allows editing real comments authored by the requesting user 2017-05-02 16:09:09 -05:00
Benjamin Goering a46773887f Initial working editComment mutation 2017-05-02 14:27:16 -05:00
Belen Curcio f3980a03b2 Removing like from core action summary 2017-05-01 11:44:24 -03:00
Belen Curcio 9ee749edb2 Removing LIKE from the core graph 2017-05-01 11:00:37 -03:00
Belen Curcio e1929f148a Removing likes from the core graph 2017-05-01 10:58:14 -03:00
Belén Curcio 7d56404e84 Merge branch 'master' into subscriptions 2017-04-24 18:09:34 -03:00
Gabriela Rodríguez Berón e337a0d18b Merge branch 'master' into subscriptions 2017-04-21 14:35:21 -07:00
Gabriela Rodríguez Berón c68afe9819 Merge branch 'master' into status-fix 2017-04-21 11:56:44 -07:00
Wyatt Johnson 5048fbb7f0 Added fix for flag actions 2017-04-21 12:47:21 -06:00
Wyatt Johnson 4e060b884b Fixed bug with status changes in the graph 2017-04-21 12:12:29 -06:00
Wyatt Johnson 1f562c8fad Merge branch 'master' into subscriptions 2017-04-20 15:17:44 -06:00
David Erwin 7c38b9b54f Merge branch 'master' into default-resolve-type 2017-04-20 16:03:38 -04:00
David Erwin 85e552cf04 Merge branch 'master' into action-summary-fix 2017-04-20 14:40:16 -04:00
Chi Vinh Le 3ff9313b03 Fix ignored users when not logged in 2017-04-21 01:18:51 +07:00
Riley Davis eda15538fe add kiwi's and wyatt's changes 2017-04-20 10:02:09 -06:00
Wyatt Johnson e1c8e75405 Merge branch 'master' into subscriptions 2017-04-18 15:43:25 -06:00
Wyatt Johnson 2eda1cb1e4 Added defaultResolveType 2017-04-18 14:50:57 -06:00
Belen Curcio e729a673a3 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-17 14:17:42 -03:00
Wyatt Johnson 7fac8ef073 Merge branch 'master' into subscriptions 2017-04-17 08:03:14 -06:00
Gabriela Rodríguez Berón fb6ba37366 Merge branch 'master' into docs-metrics 2017-04-14 10:40:28 -07:00
gaba 9cf31e0bfa A note on the from/to parameters. 2017-04-14 10:37:05 -07:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00
Belen Curcio 7969985f59 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-12 22:27:46 -03:00
Belen Curcio 22fc8555ad Extending typeDefs with Off-Topic Plugin 2017-04-12 22:26:30 -03:00
Belen Curcio 7424fc9774 Create comments with Tags 2017-04-12 19:42:39 -03:00
David Erwin c7e1943272 Merge branch 'master' into metadata 2017-04-12 15:57:24 -04:00
Belen Curcio 336dd261ca createCommentInput 2017-04-12 16:23:13 -03:00
Chi Vinh Le 92205a2c6f Fix load more buttons 2017-04-13 01:17:46 +07:00
Benjamin Goering eb1c1db09b Ignore users queries are excludeIgnored: Boolean instead of notIgnoredBy: String 2017-04-11 14:20:39 -07:00
Benjamin Goering 58736586e4 Asset commentCount and totalCommentCount can be personalized by notIgnoredBy 2017-04-11 14:20:37 -07:00
Benjamin Goering b561e9f643 Comment replyCount edge can now be filtered by notIgnoredBy 2017-04-11 14:20:37 -07:00
Benjamin Goering 873da1cea9 Embed doesn't show comments from ignored users 2017-04-11 14:20:37 -07:00
Benjamin Goering 2656141d59 Add stopIgnoringUser mutation and Embed uses it 2017-04-11 14:19:34 -07:00
Benjamin Goering 545f176bb8 Add ignoreUser mutation and myIgnoredUsers root query 2017-04-11 14:19:32 -07:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Wyatt Johnson 8e33d25a28 Some bug fixes + validation updates 2017-04-10 12:12:07 -06:00
Wyatt Johnson c12660be3b Merge branch 'master' into subscriptions 2017-04-06 15:39:24 -06:00
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