Commit Graph
947 Commits
Author SHA1 Message Date
Chi Vinh Le 6fb2a95bf2 Move query logic to coral-embed-stream 2017-04-19 20:28:14 +07:00
Chi Vinh Le d5d424bfc5 Merge branch 'master' into embed-refactor 2017-04-19 16:16:14 +07:00
Wyatt Johnson ecbb66e270 Fix linting 2017-04-18 15:53:15 -06:00
Wyatt Johnson 45094fd176 Optimized sub model 2017-04-18 15:48:33 -06:00
Wyatt Johnson e1c8e75405 Merge branch 'master' into subscriptions 2017-04-18 15:43:25 -06:00
Chi Vinh Le 4ce4c74fd9 Return a value for notification actions 2017-04-19 01:09:59 +07:00
Chi Vinh Le d3b81dff35 Merge branch 'master' into embed-refactor
Conflicts:
	client/coral-plugin-commentbox/CommentBox.js
2017-04-19 00:18:50 +07:00
Belén CurcioandGitHub ad15b38a5d Merge branch 'master' into plugin_examples 2017-04-18 13:46:44 -03:00
Chi Vinh Le af5be0469f Refactor embed 2017-04-18 23:20:39 +07:00
gaba f66e12be18 Merge branch 'master' into 143520971-stream-settings 2017-04-17 12:07:19 -07:00
Belen Curcio e729a673a3 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-17 14:17:42 -03:00
Wyatt JohnsonandGitHub 7fac8ef073 Merge branch 'master' into subscriptions 2017-04-17 08:03:14 -06: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 78286d3374 Running CommentBox reducers and triggering actions from Plugins! 2017-04-12 20:51:18 -03:00
Belen Curcio 7424fc9774 Create comments with Tags 2017-04-12 19:42:39 -03:00
Belen Curcio 7fca451263 Immutable plugins 2017-04-12 19:21:55 -03:00
Gabriela Rodríguez BerónandGitHub 42a1026f9c Merge branch 'master' into 143520971-stream-settings 2017-04-12 14:12:15 -07:00
gaba e04f0f7070 Moves settings into the state for the stream. Adds premodlinks to the query. 2017-04-12 14:08:55 -07:00
Belen Curcio e8d9f8aab8 fix createComment Mutations 2017-04-12 16:51:41 -03: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
Wyatt JohnsonandGitHub 9f8c9c7eb1 Merge branch 'master' into subscriptions 2017-04-12 10:37:15 -06:00
Belén CurcioandGitHub 2ecf64ae3e Merge branch 'master' into plugin_examples 2017-04-12 08:09:49 -03:00
Benjamin GoeringandGitHub fbcea2de6d Merge branch 'master' into ignore 2017-04-11 14:49:56 -07:00
Benjamin Goering 8cf2130e25 Update spanish translation for commentIsIgnored 2017-04-11 14:31:46 -07:00
Benjamin Goering a7be2772c3 IgnoredCommentTombstone body text is more i18n 2017-04-11 14:20:39 -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 12e383ef13 refetch streamQuery on stopIgnoringUser 2017-04-11 14:20:39 -07:00
Benjamin Goering 0dff670b70 Slot component wraps in inline element, not block (which can affect other styles) 2017-04-11 14:20:38 -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 c7d8c40770 Rename embed's My Comments tab to 'My profile' 2017-04-11 14:19:34 -07:00
Benjamin Goering 2656141d59 Add stopIgnoringUser mutation and Embed uses it 2017-04-11 14:19:34 -07:00
Benjamin Goering c59ddb72a6 Manage ignored users UI 2017-04-11 14:19:34 -07:00
Benjamin Goering 990b9794e9 When a user is ignored, replace their comments with a tombstone 2017-04-11 14:19:33 -07:00
Benjamin Goering a9412c17c9 Ignore User UI actually sends mutation 2017-04-11 14:19:32 -07:00
Belen Curcio 93ca0bf79d fixed flash messages 2017-04-11 16:14:02 -03:00
Belén CurcioandGitHub a77a623e94 Merge branch 'master' into plugin_examples 2017-04-11 15:13:51 -03:00
David ErwinandGitHub ab74ebdc52 Merge branch 'master' into subscriptions 2017-04-11 11:58:55 -04:00
Wyatt Johnson 97e3d7220e Removed test code 2017-04-10 14:39:50 -06:00
Wyatt Johnson 7acaaadcd6 Merge branch 'master' into subscriptions 2017-04-10 14:33:08 -06:00
Chi Vinh Le b4e8648177 Adjust fetchMore for apollo 1.0 2017-04-10 21:16:07 +07:00
Belen Curcio aef0f433c9 Slots and off topic plugin 2017-04-07 14:12:51 -03:00
Belen Curcio c6189e8b3a Slots and off topic plugin 2017-04-07 14:05:23 -03:00
Wyatt Johnson 5a4441e309 Adjusted loaders, webpack 2017-04-06 17:42:50 -06:00
Belen Curcio 5245dfaef9 Rolling back since its not needed 2017-04-06 19:44:26 -03:00
Belen Curcio 16f15c5faf Adding todo 2017-04-06 19:05:46 -03:00
Belen Curcio 27408e1fa1 Linting and Patch 2017-04-06 18:49:12 -03:00