From ccaa744a7832c986e039d6f5e773971bd3b11012 Mon Sep 17 00:00:00 2001
From: StephanieDClark <stephanie@devisolutions.com>
Date: Wed, 28 Jun 2017 14:26:41 -0700
Subject: [PATCH 1/5] Updates to tab classes

---
 client/coral-ui/components/Tab.js    | 2 +-
 client/coral-ui/components/TabBar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-ui/components/Tab.js b/client/coral-ui/components/Tab.js
index cc2ee82d7..492c35cbe 100644
--- a/client/coral-ui/components/Tab.js
+++ b/client/coral-ui/components/Tab.js
@@ -4,7 +4,7 @@ import styles from './Tab.css';
 export default ({children, tabId, active, onTabClick, cStyle = 'base', ...props}) => (
   <li
     key={tabId}
-    className={`${active ? `${styles[`${cStyle}--active`]} coral-tab-active` : ''} coral-tab ${props.className}`}
+    className={`${active ? `${styles[`${cStyle}--active`]} talk-tab-active` : ''} talk-tab ${props.className}`}
     onClick={() => onTabClick(tabId)}
   >
     {children}
diff --git a/client/coral-ui/components/TabBar.js b/client/coral-ui/components/TabBar.js
index 7809dee11..08f466ffc 100644
--- a/client/coral-ui/components/TabBar.js
+++ b/client/coral-ui/components/TabBar.js
@@ -17,7 +17,7 @@ class TabBar extends React.Component {
     const {children, activeTab, cStyle = 'base'} = this.props;
     return (
       <div>
-        <ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} ${this.props.className}`}>
+        <ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} talk-tab-bar ${this.props.className}`}>
           {React.Children.toArray(children)
             .filter((child) => !child.props.restricted)
             .map((child, tabId) =>

From ab84436a782a5ccb219313e0765607dacc9c82ea Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 28 Jun 2017 15:32:53 -0600
Subject: [PATCH 2/5] Update plugins.default.json

---
 plugins.default.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins.default.json b/plugins.default.json
index 7b2115421..3bc2e41bf 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -12,6 +12,7 @@
     "coral-plugin-auth",
     "coral-plugin-offtopic",
     "coral-plugin-viewing-options",
-    "coral-plugin-comment-content"
+    "coral-plugin-comment-content",
+    "talk-plugin-permalink"
   ]
 }

From 06ebd9ccc52ee78703a7975dd9a07232d04dd717 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 12:15:00 +0100
Subject: [PATCH 3/5] Bump version to 2.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2834a3e3a..95e4515fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From 867f6966baf4d0606f8927c6f1e5c4fe6f58522e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 16:52:01 +0100
Subject: [PATCH 4/5] Update dependencies to fix build

---
 package.json                            | 1 +
 plugins/talk-plugin-permalink/yarn.lock | 4 ++++
 yarn.lock                               | 6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 plugins/talk-plugin-permalink/yarn.lock

diff --git a/package.json b/package.json
index 95e4515fc..5e00ea6a5 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
   "dependencies": {
     "accepts": "^1.3.3",
     "app-module-path": "^2.2.0",
+    "async": "^2.5.0",
     "bcrypt": "^1.0.2",
     "body-parser": "^1.17.1",
     "bowser": "^1.7.0",
diff --git a/plugins/talk-plugin-permalink/yarn.lock b/plugins/talk-plugin-permalink/yarn.lock
new file mode 100644
index 000000000..fb57ccd13
--- /dev/null
+++ b/plugins/talk-plugin-permalink/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/yarn.lock b/yarn.lock
index 92edf11b5..317d83e85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -358,6 +358,12 @@ async@^2.0.1, async@^2.1.2, async@^2.1.4:
   dependencies:
     lodash "^4.14.0"
 
+async@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  dependencies:
+    lodash "^4.14.0"
+
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"

From 737cea6e761d5af109d15ac19f8898fd73d49b55 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 29 Jun 2017 16:59:00 +0100
Subject: [PATCH 5/5] Reinstall modules

---
 yarn.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 317d83e85..f98887478 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -352,13 +352,7 @@ async@2.1.4:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.0.1, async@^2.1.2, async@^2.1.4:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.5.0:
+async@^2.0.1, async@^2.1.2, async@^2.1.4, async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies: