From 6c75298b8cbfe4fe8318d1b9a424cfc07a6e5c31 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 20 Sep 2018 17:06:31 +0200
Subject: [PATCH 1/2] Upgrade RTE to fix a paste issue

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87ed024ab..426a1dda3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1342,9 +1342,9 @@
       }
     },
     "@coralproject/rte": {
-      "version": "0.10.9",
-      "resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.9.tgz",
-      "integrity": "sha512-0K+bc3JaOhjgJJ91uupev4EmSoldd/IizfjRgAQ8LbZjRc3pWprzIBhoTMChApBzz7eI9DUfw2ULg5muziV8BA==",
+      "version": "0.10.11",
+      "resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.11.tgz",
+      "integrity": "sha512-Tq8NznCOYx84QpHhZbUldxcYrztEQnnNjDC2aW5HhzltO9nBG2Hu78MzTwliML3MmaTFbLehdIb/BKGKj4eMSw==",
       "dev": true,
       "requires": {
         "bowser": "^1.0.0",
@@ -20822,9 +20822,9 @@
       "dev": true
     },
     "react-contenteditable": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.5.tgz",
-      "integrity": "sha512-mjaxwybOX7Om8Cx/0mVCUpgvAyheP48JXoABMTvzWENluFTpwAhlsLfKN4xNZk3Y7DsiidA7mUZibh0sTMly2w==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.6.tgz",
+      "integrity": "sha512-HqqAdAP69SEhZhlrzJSujVSVMmThpUzVnbNDB7dFk+LWhvuhNj5iT0DgedoURpPJqbTDX8msSkFuU7FsAMxf3Q==",
       "dev": true,
       "requires": {
         "@types/prop-types": "^15.5.4",
diff --git a/package.json b/package.json
index 5a29bc959..355e5db4d 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "@babel/polyfill": "7.0.0-beta.49",
     "@babel/preset-env": "7.0.0-beta.49",
     "@babel/preset-react": "7.0.0-beta.49",
-    "@coralproject/rte": "^0.10.9",
+    "@coralproject/rte": "^0.10.11",
     "@types/bcryptjs": "^2.4.1",
     "@types/bull": "^3.3.16",
     "@types/bunyan": "^1.8.4",

From 2a640d2bbce3e67911fcb0200e9e6a84833fc87c Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 20 Sep 2018 17:23:26 +0200
Subject: [PATCH 2/2] Don't use css capitalize

---
 .../__snapshots__/navigation.spec.tsx.snap    |  6 ++--
 .../test/__snapshots__/signIn.spec.tsx.snap   | 18 +++++------
 .../test/__snapshots__/signUp.spec.tsx.snap   | 32 +++++++++----------
 .../__snapshots__/loadMore.spec.tsx.snap      |  6 ++--
 .../__snapshots__/permalinkView.spec.tsx.snap |  4 +--
 ...permalinkViewCommentNotFound.spec.tsx.snap |  4 +--
 .../__snapshots__/renderReplies.spec.tsx.snap |  2 +-
 .../__snapshots__/renderStream.spec.tsx.snap  |  2 +-
 .../showAllReplies.spec.tsx.snap              |  6 ++--
 .../ui/components/BaseButton/BaseButton.css   |  1 -
 src/locales/en-US/auth.ftl                    |  4 +--
 src/locales/en-US/stream.ftl                  |  8 ++---
 12 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap b/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap
index 47693769e..248adc0d2 100644
--- a/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap
+++ b/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap
@@ -140,7 +140,7 @@ exports[`navigates to sign in form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -282,7 +282,7 @@ exports[`navigates to sign up form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -397,7 +397,7 @@ exports[`renders sign in form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
diff --git a/src/core/client/auth/test/__snapshots__/signIn.spec.tsx.snap b/src/core/client/auth/test/__snapshots__/signIn.spec.tsx.snap
index 898850de7..0a1d85bb9 100644
--- a/src/core/client/auth/test/__snapshots__/signIn.spec.tsx.snap
+++ b/src/core/client/auth/test/__snapshots__/signIn.spec.tsx.snap
@@ -95,7 +95,7 @@ exports[`accepts correct password 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -223,7 +223,7 @@ exports[`accepts valid email 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -364,7 +364,7 @@ exports[`checks for invalid email 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -479,7 +479,7 @@ exports[`renders sign in form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -620,7 +620,7 @@ exports[`shows error when submitting empty form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -735,7 +735,7 @@ exports[`shows server error 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -855,7 +855,7 @@ exports[`shows server error 2`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -970,7 +970,7 @@ exports[`submits form successfully 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1085,7 +1085,7 @@ exports[`submits form successfully 2`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign in and join the conversation
+        Sign in to Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
diff --git a/src/core/client/auth/test/__snapshots__/signUp.spec.tsx.snap b/src/core/client/auth/test/__snapshots__/signUp.spec.tsx.snap
index 5491404be..812641400 100644
--- a/src/core/client/auth/test/__snapshots__/signUp.spec.tsx.snap
+++ b/src/core/client/auth/test/__snapshots__/signUp.spec.tsx.snap
@@ -148,7 +148,7 @@ exports[`accepts correct password 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -342,7 +342,7 @@ exports[`accepts correct password confirmation 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -523,7 +523,7 @@ exports[`accepts valid email 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -704,7 +704,7 @@ exports[`accepts valid username 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -898,7 +898,7 @@ exports[`checks for invalid characters in username 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1092,7 +1092,7 @@ exports[`checks for invalid email 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1286,7 +1286,7 @@ exports[`checks for too long username 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1480,7 +1480,7 @@ exports[`checks for too short password 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1674,7 +1674,7 @@ exports[`checks for too short username 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -1868,7 +1868,7 @@ exports[`checks for wrong password confirmation 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2010,7 +2010,7 @@ exports[`renders sign up form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2204,7 +2204,7 @@ exports[`shows error when submitting empty form 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2346,7 +2346,7 @@ exports[`shows server error 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2493,7 +2493,7 @@ exports[`shows server error 2`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2635,7 +2635,7 @@ exports[`submits form successfully 1`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
@@ -2777,7 +2777,7 @@ exports[`submits form successfully 2`] = `
         onTouchEnd={[Function]}
         type="submit"
       >
-        Sign up and join the conversation
+        Sign up and Join the Conversation
       </button>
       <div
         className="Flex-root Flex-flex Flex-justifyCenter"
diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
index 84c4e89de..c8496f77f 100644
--- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
@@ -135,7 +135,7 @@ exports[`loads more comments 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
@@ -480,7 +480,7 @@ exports[`renders comment stream 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
@@ -634,7 +634,7 @@ exports[`renders comment stream 1`] = `
         onTouchEnd={[Function]}
         type="button"
       >
-        Load more
+        Load More
       </button>
     </div>
   </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
index 2c4a7ed98..2857bd17a 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`renders permalink view 1`] = `
       target="_parent"
       type="button"
     >
-      Show all comments
+      Show All Comments
     </a>
     <div
       className="Indent-root"
@@ -223,7 +223,7 @@ exports[`show all comments 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
index e9e7cff3c..e3d7ca646 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`renders permalink view with unknown comment 1`] = `
       target="_parent"
       type="button"
     >
-      Show all comments
+      Show All Comments
     </a>
     <p
       className="Typography-root Typography-bodyCopy Typography-colorTextPrimary"
@@ -167,7 +167,7 @@ exports[`show all comments 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
index 1b2669c4e..1ffdb59c7 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
index e4baedf5f..a6ed47452 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
index 4353d3187..fe7fa13f6 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
@@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
@@ -292,7 +292,7 @@ exports[`renders comment stream 1`] = `
               onTouchEnd={[Function]}
               type="button"
             >
-              Show all
+              Show All
             </button>
           </div>
         </div>
@@ -437,7 +437,7 @@ exports[`show all replies 1`] = `
           onTouchEnd={[Function]}
           type="submit"
         >
-          Sign in and join the conversation
+          Sign in and Join the Conversation
         </button>
       </div>
     </div>
diff --git a/src/core/client/ui/components/BaseButton/BaseButton.css b/src/core/client/ui/components/BaseButton/BaseButton.css
index a20ff333a..14b111258 100644
--- a/src/core/client/ui/components/BaseButton/BaseButton.css
+++ b/src/core/client/ui/components/BaseButton/BaseButton.css
@@ -1,6 +1,5 @@
 .root {
   composes: buttonReset from "talk-ui/shared/buttonReset.css";
-  text-transform: capitalize;
 }
 
 .keyboardFocus {
diff --git a/src/locales/en-US/auth.ftl b/src/locales/en-US/auth.ftl
index 236530dd6..81b40429d 100644
--- a/src/locales/en-US/auth.ftl
+++ b/src/locales/en-US/auth.ftl
@@ -4,7 +4,7 @@
 
 signIn-signInToJoinHeader = Sign in to join the conversation
 
-signIn-signInAndJoinButton = Sign in and join the conversation
+signIn-signInAndJoinButton = Sign in to Join the Conversation
 
 signIn-emailAddressLabel = Email Address
 signIn-emailAddressTextField =
@@ -22,7 +22,7 @@ signIn-noAccountSignUp = Don't have an account? <button>Sign Up</button>
 
 signUp-signUpToJoinHeader = Sign up to join the conversation
 
-signUp-signUpAndJoinButton = Sign up and join the conversation
+signUp-signUpAndJoinButton = Sign up and Join the Conversation
 
 signUp-emailAddressLabel = Email Address
 signUp-emailAddressTextField =
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index 1a2b81f5f..a62d6723a 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -17,13 +17,13 @@ general-userBoxAuthenticated-notYou =
 comments-streamQuery-assetNotFound = Asset not found
 
 comments-postCommentForm-submit = Submit
-comments-stream-loadMore = Load more
-comments-replyList-showAll = Show all
+comments-stream-loadMore = Load More
+comments-replyList-showAll = Show All
 
 comments-permalinkButton-share = Share
 comments-permalinkPopover-copy = Copy
 comments-permalinkPopover-copied = Copied
-comments-permalinkView-showAllComments = Show all comments
+comments-permalinkView-showAllComments = Show All Comments
 comments-permalinkView-commentNotFound = Comment not found
 
 comments-rte-bold =
@@ -37,7 +37,7 @@ comments-rte-blockquote =
 
 comments-poweredBy = Powered by <logo>{ -brand-name }</logo>
 
-comments-postCommentFormFake-signInAndJoin = Sign in and join the conversation
+comments-postCommentFormFake-signInAndJoin = Sign in and Join the Conversation
 
 comments-postCommentForm-rteLabel = Post a comment