 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 |
|
|
Riley Davis
|
e343897526
|
user detail copy button regression
|
2017-05-17 15:11:00 -06:00 |
|
|
Chi Vinh Le
|
492b973206
|
Add 1 extra suspension minute
|
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
|
a0f41bb19d
|
show total comments and rejected %
|
2017-05-17 10:54:14 -06:00 |
|
|
Chi Vinh Le
|
71c743dda7
|
Extend backend to support new suspend feature
|
2017-05-17 20:05:18 +07: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 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
Belen Curcio
|
843c3a16c8
|
Admin share same network interface, and unifying actions
|
2017-05-15 14:48:12 -03:00 |
|
|
Chi Vinh Le
|
a9207428fe
|
Calculate "until"
|
2017-05-15 23:07:46 +07:00 |
|
|
Chi Vinh Le
|
63fa3c4de7
|
Implement suspend user components
|
2017-05-15 22:28:04 +07:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Wyatt Johnson
|
08e7a90d69
|
lint fixes
|
2017-05-11 17:34:47 -06:00 |
|
|
riley
|
602c3d0be2
|
use a slot instead of trying to use facebook directly
|
2017-05-10 12:28:33 -06:00 |
|
|
Riley Davis
|
75fb7b6dc2
|
Merge branch 'master' into user-detail-ui
|
2017-05-10 11:44:36 -06:00 |
|
|
Riley Davis
|
40ff265ab1
|
merge master
|
2017-05-10 11:07:48 -06:00 |
|
|
Belen Curcio
|
250a578dd7
|
lint, and merge conficts
|
2017-05-10 11:05:21 -03:00 |
|
|
Riley Davis
|
084f6b28ed
|
merge master
|
2017-05-09 10:06:41 -06:00 |
|
|
Belen Curcio
|
3c06ee9360
|
Adds slots to admin stream
|
2017-05-09 12:21:21 -03:00 |
|
|
Kiwi
|
4eb20108b1
|
Merge branch 'master' into approve-reject-noop
|
2017-05-09 20:06:11 +07:00 |
|
|
Kiwi
|
6fb227eb72
|
Merge branch 'master' into approve-reject-noop
|
2017-05-09 17:49:30 +07:00 |
|
|
Riley Davis
|
2490e65981
|
merge master
|
2017-05-08 17:09:23 -06:00 |
|
|
Riley Davis
|
242f3ea5ea
|
do not highlight partial word matches in admin since this is not how the backend works
|
2017-05-08 17:01:36 -06:00 |
|
|
Kim Gardner
|
b2c8e3b254
|
Merge branch 'master' into context-from-comment
|
2017-05-08 17:34:55 -04:00 |
|
|
Riley Davis
|
3e258b1787
|
move approved tab
|
2017-05-08 14:59:23 -06:00 |
|
|
Riley Davis
|
4ff42385e3
|
remove dead code
|
2017-05-05 14:41:19 -06:00 |
|
|
Riley Davis
|
519ca7beb5
|
en español
|
2017-05-05 11:55:28 -06:00 |
|
|
Riley Davis
|
5db48e8c0f
|
make it a blue link instead of the whole thing
|
2017-05-05 11:35:18 -06:00 |
|
|
Riley Davis
|
5f9240f201
|
open the comment in context when clicked
|
2017-05-04 16:32:07 -06:00 |
|
|
Riley Davis
|
4507059a04
|
same thing for BanUserDialog and the keyboard shortcuts
|
2017-05-04 15:43:23 -06:00 |
|
|
Riley Davis
|
67b17160cb
|
don't accept/reject when a comment is already accepted/rejected respectively
|
2017-05-04 14:42:43 -06:00 |
|
|
riley
|
57b0b5ec67
|
add a drawer for the user details
|
2017-05-04 13:58:43 -06:00 |
|
|
Riley Davis
|
d255ea84b1
|
merge master
|
2017-05-04 11:19:01 -06:00 |
|
|
riley
|
4a42436b7b
|
load user via HOC UserDetail
|
2017-05-03 12:54:02 -06:00 |
|
|
riley
|
9e1b470cb5
|
saving my place
|
2017-05-03 09:32:05 -06:00 |
|
|
riley
|
b7d3113677
|
apparently you can't make a fragment on RootQuery
|
2017-05-02 15:18:48 -06:00 |
|
|
Kim Gardner
|
f6e2caf65f
|
Merge branch 'master' into admin-queue-polish
|
2017-05-02 12:38:48 -04:00 |
|
|
Riley Davis
|
32dd554331
|
load more comments if the mod has moderated them all and there are more availabile
|
2017-05-01 10:30:18 -06:00 |
|
|
Riley Davis
|
8293408c52
|
pull some custom code out of ActionButton
|
2017-05-01 10:22:11 -06:00 |
|
|
Riley Davis
|
41d4bd1012
|
counts update
|
2017-04-28 11:52:07 -06:00 |
|
|
riley
|
cd9648b251
|
format mod queue counts
|
2017-04-27 15:01:59 -06:00 |
|
|
riley
|
f6cede3fda
|
add accepted to propTypes
|
2017-04-27 11:23:27 -06:00 |
|
|
Kim Gardner
|
af80c4d8ad
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 11:59:30 -04:00 |
|
|
Kim Gardner
|
6e98d176e7
|
Merge branch 'master' into 143530761-remove-loading-when-searching
|
2017-04-27 11:41:51 -04:00 |
|
|
Riley Davis
|
40b7669ed8
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 09:40:30 -06:00 |
|
|
David Erwin
|
81680442f0
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 17:20:37 -04:00 |
|