From f7dcd1ba2cd9d555f4dbcb743c2d13904e8fc84b Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Tue, 14 Feb 2017 08:07:49 -0600
Subject: [PATCH 1/3] Stick to expose-loader 0.7.1

0.7.2 causes a ReferenceError: jQuery is not defined in autosize.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6f213de63..52467cc9e 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "eslint-plugin-jsdoc": "*",
     "eslint-plugin-react": "*",
     "eslint-plugin-react-native": "^2.2.1",
-    "expose-loader": "*",
+    "expose-loader": "0.7.1",
     "file-loader": "^0.10.0",
     "flow-bin": "^0.37.0",
     "haste-resolver-webpack-plugin": "^0.2.2",

From 732a433ec1c83473960e46cdd7bf194dbdb24728 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Tue, 14 Feb 2017 16:07:12 -0600
Subject: [PATCH 2/3] livestream link to provide more context to users on where
 to retrieve their stream key

---
 lang/main.json                    | 1 +
 modules/UI/recording/Recording.js | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lang/main.json b/lang/main.json
index 3e398633a..78a8249d1 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -387,6 +387,7 @@
         "failedToStart": "Live streaming failed to start",
         "buttonTooltip": "Start / Stop live stream",
         "streamIdRequired": "Please fill in the stream id in order to launch the live streaming.",
+        "streamIdHelp": "Where do I find this?",
         "error": "Live streaming failed. Please try again.",
         "busy": "All recorders are currently busy. Please try again later."
     }
diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index 26153f8b5..bed6be570 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -51,6 +51,9 @@ function _requestLiveStreamId() {
     const streamIdRequired
         = APP.translation.generateTranslationHTML(
             "liveStreaming.streamIdRequired");
+    const streamIdHelp
+        = APP.translation.generateTranslationHTML(
+            "liveStreaming.streamIdHelp");
 
     return new Promise(function (resolve, reject) {
         dialog = APP.UI.messageHandler.openDialogWithStates({
@@ -60,7 +63,8 @@ function _requestLiveStreamId() {
                     `<input  class="input-control"
                     name="streamId" type="text"
                     data-i18n="[placeholder]dialog.streamKey"
-                    autofocus>`,
+                    autofocus><div style="text-align: right">
+                    <a class="link" target="_new" href="https://jitsi.org/live">`+streamIdHelp+`</a></div>`,
                 persistent: false,
                 buttons: [
                     {title: cancelButton, value: false},

From 6d664f133e3ba479044ee630d4b179dc03bc50d7 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Tue, 14 Feb 2017 17:11:31 -0600
Subject: [PATCH 3/3] Cosmetic fixes for column length lint errors

---
 modules/UI/recording/Recording.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index bed6be570..d8a805fff 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -64,7 +64,9 @@ function _requestLiveStreamId() {
                     name="streamId" type="text"
                     data-i18n="[placeholder]dialog.streamKey"
                     autofocus><div style="text-align: right">
-                    <a class="link" target="_new" href="https://jitsi.org/live">`+streamIdHelp+`</a></div>`,
+                    <a class="link" target="_new" 
+                    href="https://jitsi.org/live">`+streamIdHelp+
+                    `</a></div>`,
                 persistent: false,
                 buttons: [
                     {title: cancelButton, value: false},