From daa6ce60ab713ff8efe013bf4cb2343be164de78 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Mar 2017 15:41:27 -0600
Subject: [PATCH 1/4] show the total comment count instead of the parent count

---
 client/coral-embed-stream/src/Embed.js                     | 2 +-
 client/coral-framework/graphql/queries/streamQuery.graphql | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index a3d2a24a9..962eb1030 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -120,7 +120,7 @@ class Embed extends Component {
       <div style={expandForLogin}>
         <div className="commentStream">
           <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 restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index e9f4c827c..03af1de4c 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -29,6 +29,7 @@ query AssetQuery($asset_id: ID, $asset_url: String!, $comment_id: ID!, $has_comm
             requireEmailConfirmation
         }
         commentCount
+        totalCommentCount
         comments(limit: 10) {
             ...commentView
             replyCount

From 5092b849b3761a38e2dbea2bf9943a5087266baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20C=C3=BAbico?= <pablocuadrado@gmail.com>
Date: Tue, 28 Mar 2017 23:22:12 -0300
Subject: [PATCH 2/4] Found some typos on the spanish side :)

---
 client/coral-settings/translations.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/coral-settings/translations.json b/client/coral-settings/translations.json
index 7b6ce2344..9ed95f6fc 100644
--- a/client/coral-settings/translations.json
+++ b/client/coral-settings/translations.json
@@ -10,13 +10,13 @@
     "fromSettingsPage": "From the Profile Page you can see your comment history."
   },
   "es":{
-    "profile": "Pérfil",
-    "userNoComment": "No has dejado áun ningún comentario. ¡Unete a la conversación!",
+    "profile": "Perfil",
+    "userNoComment": "No has dejado aún ningún comentario. ¡Únete a la conversación!",
     "allComments": "Todos los comentarios",
-    "profileSettings": "Configuración del pérfil",
+    "profileSettings": "Configuración del perfil",
     "myCommentHistory": "Mi historial de comentarios",
     "signIn": "Entrar",
-    "toAccess": "para acceder a al pérfil",
-    "fromSettingsPage": "Desde la peagina de configuración puedes ver tu historia de comentarios."
+    "toAccess": "para acceder a al perfil",
+    "fromSettingsPage": "Desde la página de configuración puedes ver tu historia de comentarios."
   }
 }

From d80ed467f125a02cb96fbd59baa04fc418613760 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 29 Mar 2017 21:41:22 +0700
Subject: [PATCH 3/4] Remove duplicate material.css

---
 client/coral-admin/src/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js
index 00190847a..9a532856e 100644
--- a/client/coral-admin/src/index.js
+++ b/client/coral-admin/src/index.js
@@ -7,7 +7,6 @@ import store from './services/store';
 
 import App from './components/App';
 
-import 'react-mdl/extra/material.css';
 import 'react-mdl/extra/material.js';
 
 render(

From 00a74f05cb03a425a877d44dd30fc5c0df09282d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 30 Mar 2017 00:44:26 +0700
Subject: [PATCH 4/4] Use standard mdl theme

---
 views/admin.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/admin.ejs b/views/admin.ejs
index 36e3d15c8..947f15425 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -21,7 +21,7 @@
     <meta name="msapplication-TileColor" content="#ffffff">
     <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://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">
       body, #root {
         width: 100%;