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

Merge branch 'master' into change-permalink-behavior

Browse Source
This commit is contained in:
riley
2017-03-29 12:27:52 -06:00
parent b7ce669cfc 0726603a4e
commit 3e00a4e842
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/index.js
-1
View File
@@ -7,7 +7,6 @@ import store from './services/store';
import App from './components/App'; import App from './components/App';
import 'react-mdl/extra/material.css';
import 'react-mdl/extra/material.js'; import 'react-mdl/extra/material.js';
render( render(
client/coral-embed-stream/src/Embed.js
+1 -1
View File
@@ -120,7 +120,7 @@ class Embed extends Component {
<div style={expandForLogin}> <div style={expandForLogin}>
<div className="commentStream"> <div className="commentStream">
<TabBar onChange={this.changeTab} activeTab={activeTab}> <TabBar onChange={this.changeTab} activeTab={activeTab}>
<Tab><Count count={asset.commentCount}/></Tab> <Tab><Count count={asset.totalCommentCount}/></Tab>
<Tab>{lang.t('MY_COMMENTS')}</Tab> <Tab>{lang.t('MY_COMMENTS')}</Tab>
<Tab restricted={!isAdmin}>Configure Stream</Tab> <Tab restricted={!isAdmin}>Configure Stream</Tab>
</TabBar> </TabBar>
client/coral-framework/graphql/queries/streamQuery.graphql
+1
View File
@@ -29,6 +29,7 @@ query AssetQuery($asset_id: ID, $asset_url: String!, $comment_id: ID!, $has_comm
requireEmailConfirmation requireEmailConfirmation
} }
commentCount commentCount
totalCommentCount
comments(limit: 10) { comments(limit: 10) {
...commentView ...commentView
replyCount replyCount
client/coral-settings/translations.json
+5 -5
View File
@@ -10,13 +10,13 @@
"fromSettingsPage": "From the Profile Page you can see your comment history." "fromSettingsPage": "From the Profile Page you can see your comment history."
}, },
"es":{ "es":{
"profile": "Pérfil", "profile": "Perfil",
"userNoComment": "No has dejado áun ningún comentario. ¡Unete a la conversación!", "userNoComment": "No has dejado aún ningún comentario. ¡Únete a la conversación!",
"allComments": "Todos los comentarios", "allComments": "Todos los comentarios",
"profileSettings": "Configuración del pérfil", "profileSettings": "Configuración del perfil",
"myCommentHistory": "Mi historial de comentarios", "myCommentHistory": "Mi historial de comentarios",
"signIn": "Entrar", "signIn": "Entrar",
"toAccess": "para acceder a al pérfil", "toAccess": "para acceder a al perfil",
"fromSettingsPage": "Desde la peagina de configuración puedes ver tu historia de comentarios." "fromSettingsPage": "Desde la página de configuración puedes ver tu historia de comentarios."
} }
} }
views/admin.ejs
+1 -1
View File
@@ -21,7 +21,7 @@
<meta name="msapplication-TileColor" content="#ffffff"> <meta name="msapplication-TileColor" content="#ffffff">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <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="https://code.getmdl.io/1.2.1/material.min.css">
<style media="screen"> <style media="screen">
body, #root { body, #root {
width: 100%; width: 100%;