 Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
Chi Vinh Le
|
0588a8ab66
|
Use async / await :-)
|
2017-05-19 02:07:38 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Kim Gardner
|
e80e79f267
|
Merge branch 'master' into edit-comment-settings
|
2017-05-18 14:23:14 -04:00 |
|
|
riley
|
ff75b9474a
|
merge master
|
2017-05-18 12:18:00 -06:00 |
|
|
riley
|
056ba9a04c
|
do the same thing for the Drawer
|
2017-05-18 12:11:11 -06:00 |
|
|
riley
|
d98ce38bf5
|
show config tab to admins. hide menu items from users that can't access admin
|
2017-05-18 12:06:07 -06:00 |
|
|
Benjamin Goering
|
1d322d8c70
|
Merge branch 'master' into fix-ignore-user
|
2017-05-18 10:50:00 -07:00 |
|
|
Benjamin Goering
|
aaa2da6c23
|
Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero
|
2017-05-18 10:43:38 -07:00 |
|
|
Wyatt Johnson
|
12713dae86
|
Removed unused assets
|
2017-05-18 11:18:08 -06:00 |
|
|
Benjamin Goering
|
fb33eefe8e
|
trivial changes requested by review
|
2017-05-18 08:19:52 -07:00 |
|
|
Benjamin Goering
|
cfc6d4bfea
|
Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user
|
2017-05-18 08:12:40 -07:00 |
|
|
Benjamin Goering
|
6bbeee3a6b
|
StopIgnoringUser does not refetch EmbedQuery
|
2017-05-18 08:11:39 -07:00 |
|
|
Benjamin Goering
|
340d3cea62
|
contains/Stream setCommentCountCache waits for refetch promise
|
2017-05-18 08:10:20 -07:00 |
|
|
Kim Gardner
|
e8e9dbe3ca
|
Merge branch 'master' into fix-ignore-user
|
2017-05-18 09:49:54 -04:00 |
|
|
Belen Curcio
|
132b0a854d
|
linting
|
2017-05-18 00:22:39 -03:00 |
|
|
Belen Curcio
|
17e7b28688
|
Fully working best tag
|
2017-05-18 00:21:08 -03:00 |
|
|
Belen Curcio
|
b795368674
|
Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags
|
2017-05-17 23:54:38 -03:00 |
|
|
Belen Curcio
|
f57fa7cb7b
|
Update Cache
|
2017-05-17 23:53:07 -03:00 |
|
|
gaba
|
9e954f0ae3
|
Fix timeago with lang.
|
2017-05-17 18:05:41 -07:00 |
|
|
Benjamin Goering
|
cb45f0a8b3
|
Merge branch 'master' into edit-comment-settings
|
2017-05-17 15:46:14 -07:00 |
|
|
Benjamin Goering
|
d93ad38dd1
|
Admins can change Edit Comment Window length in Moderation Settings
|
2017-05-17 15:39:19 -07:00 |
|
|
riley
|
c4210db307
|
staff should not see moderate tag. translations
|
2017-05-17 16:10:02 -06:00 |
|
|
riley
|
3fc1029a93
|
do not require auth in the Header
|
2017-05-17 16:00:01 -06:00 |
|
|
Riley Davis
|
54abaeb587
|
wrap the not-authorized warning in a template
|
2017-05-17 15:47:41 -06:00 |
|
|
Riley Davis
|
4a97db3357
|
emma's copy
|
2017-05-17 15:41:49 -06:00 |
|
|
Riley Davis
|
88377b3180
|
do not show Config tab for non-admins
|
2017-05-17 15:37:13 -06:00 |
|
|
Riley Davis
|
e343897526
|
user detail copy button regression
|
2017-05-17 15:11:00 -06:00 |
|
|
Benjamin Goering
|
294eb6c81d
|
Merge branch 'master' into fix-ignore-user
|
2017-05-17 13:57:23 -07:00 |
|
|
Benjamin Goering
|
9eac05c8fb
|
Ignored user tombstones work again
|
2017-05-17 13:18:59 -07:00 |
|
|
gaba
|
8d492ca4e9
|
Adds a few missing keys.
|
2017-05-17 13:18:04 -07:00 |
|
|
gaba
|
3aceb0dc38
|
Merge branch 'master' into i18n-refactor
|
2017-05-17 12:59:24 -07:00 |
|
|
gaba
|
5bd9bc992b
|
Move i18n into a service
|
2017-05-17 12:53:36 -07:00 |
|
|
Chi Vinh Le
|
492b973206
|
Add 1 extra suspension minute
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
2bdf413b88
|
Integrate into embed stream
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
76e87f4c34
|
Move previous suspendUser feature to rejectUsername
|
2017-05-18 02:28:01 +07:00 |
|
|
Riley Davis
|
c66e3141e0
|
actually check permissions
|
2017-05-17 11:38:43 -06:00 |
|
|
Riley Davis
|
a0f41bb19d
|
show total comments and rejected %
|
2017-05-17 10:54:14 -06:00 |
|
|
Wyatt Johnson
|
7a256bdd2b
|
Merge branch 'master' into 142993479-tags
|
2017-05-17 10:01:58 -06:00 |
|
|
Belen Curcio
|
6664f73d2d
|
Best tag working, only Optimistic Missing
|
2017-05-17 11:57:51 -03:00 |
|
|
Chi Vinh Le
|
056ff427a5
|
Merge branch 'master' into suspend-user
|
2017-05-17 21:50:28 +07:00 |
|
|
Belen Curcio
|
b2f1707f17
|
Fully working offtopic
|
2017-05-17 11:19:06 -03:00 |
|
|
Chi Vinh Le
|
71c743dda7
|
Extend backend to support new suspend feature
|
2017-05-17 20:05:18 +07:00 |
|
|
Belen Curcio
|
793f634959
|
Working tags
|
2017-05-17 09:01:41 -03:00 |
|
|
riley
|
03ce044c53
|
merge master
|
2017-05-16 16:33:41 -06:00 |
|
|
riley
|
31647fb2f0
|
have function params in the correct order
|
2017-05-16 15:41:27 -06:00 |
|
|
riley
|
7896b3f33b
|
merge master
|
2017-05-16 09:43:49 -06:00 |
|
|
Chi Vinh Le
|
97121382c7
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
client/coral-admin/src/containers/ModerationQueue/components/Comment.js
client/coral-framework/utils/index.js
package.json
|
2017-05-16 21:02:33 +07:00 |
|
|
Chi Vinh Le
|
c7e0577708
|
Merge branch 'master' into invalidate-old-data
|
2017-05-16 18:17:45 +07:00 |
|
|
Chi Vinh Le
|
2ab8cc9481
|
Allow Apollo to invalidate old user data
|
2017-05-16 18:17:43 +07:00 |
|