From c28c78a4053de93b6ea1d9eff5c7ab72f4a5a329 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Mon, 6 Mar 2017 13:57:54 -0600
Subject: [PATCH] Minor updates for release -- bumped the API version
---
bigbluebutton-client/locale/en_US/bbbResources.properties | 4 ++--
bigbluebutton-client/resources/prod/BigBlueButton.html | 2 +-
bigbluebutton-config/bin/bbb-conf | 8 ++++++++
.../grails-app/conf/bigbluebutton.properties | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 3ea7ad4bf4..c796672d26 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -288,8 +288,8 @@ bbb.video.streamClose.toolTip = Close stream for: {0}
bbb.screensharePublish.title = Screen Sharing: Presenter's Preview
bbb.screensharePublish.pause.tooltip = Pause screen share
bbb.screensharePublish.pause.label = Pause
-bbb.screensharePublish.restart.tooltip = Restart screen share
-bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.restart.tooltip = Resume screen share
+bbb.screensharePublish.restart.label = Resume
bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
bbb.screensharePublish.minimizeBtn.toolTip = Minimize
diff --git a/bigbluebutton-client/resources/prod/BigBlueButton.html b/bigbluebutton-client/resources/prod/BigBlueButton.html
index db379cfd79..41dfc3f40d 100755
--- a/bigbluebutton-client/resources/prod/BigBlueButton.html
+++ b/bigbluebutton-client/resources/prod/BigBlueButton.html
@@ -191,7 +191,7 @@
<button id="enterFlash" type="button" class="visually-hidden" onclick="startFlashFocus();">Set focus to client</button>
<div id="content">
<div id="altFlash" style="width:50%; margin-left: auto; margin-right: auto; ">
- You need Adobe Flash installed and enabled in order to use this client.
+ <h3>You need Adobe Flash installed and enabled in order to use this client.</h3>
<br/>
<div style="width:50%; margin-left: auto; margin-right: auto; ">
<a href="http://www.adobe.com/go/getflashplayer">
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index cdca4d4ee3..1f1ed8c3f7 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1460,6 +1460,14 @@ check_state() {
echo "# sudo bbb-conf --setip $BBB_WEB_IP"
echo "#"
fi
+
+ if [ -z $(cat /usr/share/red5/webapps/screenshare/WEB-INF/screenshare.properties | tr -d '\r' | sed -n "/useH264[ ]*=[ ]*/{s/useH264[ ]*=[ ]*//;p}") ]; then
+ echo "# Error: Detected there is no value set for useH264 in"
+ echo "#"
+ echo "# /usr/share/red5/webapps/screenshare/WEB-INF/screenshare.properties"
+ echo "#"
+ fi
+
exit 0
}
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 2b77733d19..4d2449ac1c 100644
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -172,7 +172,7 @@ defaultAvatarURL=${bigbluebutton.web.serverURL}/client/avatar.png
# The URL of the default configuration
defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml
-apiVersion=1.0
+apiVersion=1.1
# Salt which is used by 3rd-party apps to authenticate api calls
securitySalt=a820d30da2db356124fce5bd5d8054b4
--
GitLab