wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-14 11:18:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into selected-bug

Browse Source
This commit is contained in:
Kim Gardner
2018-01-11 15:10:09 -05:00
committed by GitHub
parent 2269c91244 24b6a4f16f
commit f340cdd4b7
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/CommentLabels.js
+1 -1
View File
@@ -22,7 +22,7 @@ function getUserFlaggedType(actions) {
}
function hasSuspectedWords(actions) {
return actions.some((action) => action.__typename === 'FlagAction' && action.reason === 'Matched suspect word filter');
return actions.some((action) => action.__typename === 'FlagAction' && action.reason === 'SUSPECT_WORD');
}
function hasHistoryFlag(actions) {
client/coral-admin/src/components/ToastContainer.css
+1 -1
View File
@@ -207,7 +207,7 @@
.toastify__body {
color: white;
overflow-x: scroll;
overflow-x: auto;
font-size: 15px;
font-weight: 400;
}
client/coral-admin/src/containers/UserDetailComment.js
+3
View File
@@ -35,6 +35,9 @@ export default withFragments({
editing {
edited
}
status_history {
type
}
...${getDefinitionName(CommentLabels.fragments.comment)}
...${getDefinitionName(CommentDetails.fragments.comment)}
}
client/coral-admin/src/routes/Configure/components/Configure.css
+1 -1
View File
@@ -20,7 +20,7 @@
.mainContent {
width: calc(100% - 300px);
padding: 10px 14px 80px 14px;
padding: 10px 14px 120px 14px;
box-sizing: border-box;
max-width: 718px;
}