 Gabriela Rodríguez Berón
|
e337a0d18b
|
Merge branch 'master' into subscriptions
|
2017-04-21 14:35:21 -07:00 |
|
|
Wyatt Johnson
|
5048fbb7f0
|
Added fix for flag actions
|
2017-04-21 12:47:21 -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 |
|
|
Chi Vinh Le
|
3ff9313b03
|
Fix ignored users when not logged in
|
2017-04-21 01:18:51 +07: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 |
|
|
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
|
7424fc9774
|
Create comments with Tags
|
2017-04-12 19:42:39 -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 |
|
|
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
|
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 |
|
|
Chi Vinh Le
|
be64905426
|
Fix graph not importing plugin resolvers
|
2017-04-06 17:45:34 +07:00 |
|
|
Wyatt Johnson
|
990fe34873
|
Merge branch 'master' into support-lazy-assets
|
2017-04-05 16:21:16 -06:00 |
|
|
Wyatt Johnson
|
e6dba11984
|
Merge branch 'master' into subscriptions
|
2017-04-05 15:31:08 -06:00 |
|
|
Wyatt Johnson
|
c5ce22c5e6
|
Fixed for syntax
|
2017-04-05 14:36:35 -06:00 |
|
|
Chi Vinh Le
|
b0effe8731
|
Merge with 'master'
|
2017-04-06 01:26:48 +07:00 |
|
|
Chi Vinh Le
|
582f799b6c
|
Revert "Merge"
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
|
2017-04-06 00:53:21 +07:00 |
|
|
Belen Curcio
|
d9835a17d3
|
Merge
|
2017-04-05 12:08:07 -03:00 |
|
|
Wyatt Johnson
|
877372814a
|
Merge branch 'master' into support-lazy-assets
|
2017-04-05 08:14:31 -06:00 |
|
|
Wyatt Johnson
|
45c7cbad9e
|
Merge branch 'master' into subscriptions
|
2017-04-05 08:08:56 -06:00 |
|
|
Wyatt Johnson
|
07d1f9d3cf
|
Merge branch 'master' into subscriptions
|
2017-04-04 09:58:50 -06:00 |
|
|
Wyatt Johnson
|
52948a4165
|
Added support for a plugin which disables lazy assets
|
2017-04-03 16:51:14 -06:00 |
|
|
Wyatt Johnson
|
0108673566
|
Added remote plugin reconciliation
|
2017-03-31 15:54:39 -06:00 |
|
|
Belen Curcio
|
004e8d5fe9
|
Using wrapResponse
|
2017-03-31 12:37:11 -03:00 |
|
|
Wyatt Johnson
|
ffbe976760
|
working websockets
|
2017-03-29 09:35:56 -06:00 |
|
|
gaba
|
84f1d3ece2
|
Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts.
|
2017-03-23 16:02:25 -07:00 |
|
|
Wyatt Johnson
|
63ef49d595
|
Initial subscription impl
|
2017-03-23 11:09:14 -06:00 |
|
|
David Erwin
|
903aa23f19
|
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:18:55 -04:00 |
|
|
gaba
|
7522bd9cd6
|
Sends a mail to the suspended user.
|
2017-03-21 15:08:46 -07:00 |
|
|
gaba
|
be2ecf0838
|
Adds user and message to flagaction to display in FE.
|
2017-03-20 13:38:11 -07:00 |
|
|
gaba
|
2fff47c753
|
Merge branch 'master' into plugins
|
2017-03-20 10:46:30 -07:00 |
|
|
David Erwin
|
abd0b51441
|
Removing log
|
2017-03-20 07:42:29 -07:00 |
|
|
gaba
|
6f3cb34817
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:39:00 -07:00 |
|
|
riley
|
8348e1e462
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:36:22 -07:00 |
|
|
gaba
|
258fd8b25a
|
Initial implementation at plugins
|
2017-03-20 07:36:06 -07:00 |
|
|
Wyatt Johnson
|
fcc93963c4
|
Added support for total comment count
|
2017-03-20 07:29:08 -07:00 |
|
|
Wyatt Johnson
|
63220cb6a7
|
Some fixes to make it work
|
2017-03-08 19:14:02 -07:00 |
|