wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-15 12:55:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into keep-drafts

Browse Source
This commit is contained in:
Kiwi
2018-02-01 17:50:06 +01:00
committed by GitHub
parent 7e135cef47 2234acc28e
commit 894141619c
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/Embed.js
+1 -1
View File
@@ -43,7 +43,7 @@ export default class Embed extends React.Component {
{t('framework.my_profile')}
</Tab>,
];
if (can(user, 'UPDATE_CONFIG')) {
if (can(user, 'UPDATE_ASSET_CONFIG')) {
tabs.push(
<Tab
key="config"
client/coral-framework/services/perms.js
+1
View File
@@ -33,6 +33,7 @@ const basicRoles = {
};
const queryRoles = {
UPDATE_ASSET_CONFIG: [ADMIN, MODERATOR],
UPDATE_CONFIG: [ADMIN],
ACCESS_ADMIN: [ADMIN, MODERATOR],
VIEW_USER_EMAILS: [ADMIN],
views/admin/confirm-email.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Email Verification</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="/public/css/admin.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>
views/admin/password-reset.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Password Reset</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="/public/css/admin.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%_ if (locals.customCssUrl) { _%>
<link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
<%_ } _%>