diff --git a/bbb-api-demo/src/main/webapp/demo10.jsp b/bbb-api-demo/src/main/webapp/demo10.jsp index b868211328c8f7b5a354cb438f1f052f5949cf7f..df7b6b46902f111fe3e02a0798d0064027d822f7 100755 --- a/bbb-api-demo/src/main/webapp/demo10.jsp +++ b/bbb-api-demo/src/main/webapp/demo10.jsp @@ -263,7 +263,7 @@ with BigBlueButton; if not, If not, see <http://www.gnu.org/licenses/>. // // This is the URL for to join the meeting as moderator // - String welcomeMsg = "<br>Welcome to %%CONFNAME%%!<br><br>For help see our <a href=\"event:http://www.bigbluebutton.org/content/videos\"><u>tutorial videos</u></a>.<br><br>To join the voice bridge for this meeting click the headset icon in the upper-left <b>(you can mute yourself in the Listeners window)</b>.<br><br>This meeting is being recorded (webcams + audio + presentation + chat)."; + String welcomeMsg = "<br>Welcome to %%CONFNAME%%!<br><br>For help see our <a href=\"event:http://www.bigbluebutton.org/content/videos\"><u>tutorial videos</u></a>.<br><br>To join the voice bridge for this meeting click the headset icon in the upper-left <b>(you can mute yourself in the Listeners window)</b>.<br><br>This meeting is being recorded."; String joinURL = getJoinURL(username, meetingID, "true", welcomeMsg, metadata, null); if (joinURL.startsWith("http://")) { %> diff --git a/bigbluebutton-config/bigbluebutton-release b/bigbluebutton-config/bigbluebutton-release index 6b46d24d1e131ba372624aba90d07f44504007af..42d37d58822ec891afa799bd1bb7b2d1e56d3657 100644 --- a/bigbluebutton-config/bigbluebutton-release +++ b/bigbluebutton-config/bigbluebutton-release @@ -1 +1 @@ -BIGBLUEBUTTON_RELEASE=0.81-RC +BIGBLUEBUTTON_RELEASE=0.81-RC2 diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record index dfbbed87ca1f057065d9a1b8aec0f02dc120910b..fbd29a0a0039178dd7f97d1ea6aa5ef56485127d 100755 --- a/bigbluebutton-config/bin/bbb-record +++ b/bigbluebutton-config/bin/bbb-record @@ -106,8 +106,6 @@ mark_for_republish() { done } -BIGBLUEBUTTON_RELEASE=0.81 - need_root() { if [ $EUID != 0 ]; then echo "Need to be root to run this option" diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html index 0ba56d8a77e398b4391b9fec8b4ca3b3c756ea4a..82010fa9d7f4c3a0c3dbc60e76fb4da67362346b 100755 --- a/bigbluebutton-config/web/index.html +++ b/bigbluebutton-config/web/index.html @@ -101,7 +101,7 @@ <p id="legal"> <br>BigBlueButton and the BigBlueButton logo are trademarks of BigBlueButton Inc.<br> Copyright © 2013 <a href="http://bigbluebutton.org/" title="BigBlueButton">BigBlueButton Inc.</a> <br> - <a href="http://code.google.com/p/bigbluebutton/wiki/ReleaseNotes" title="BigBlueButton Release Notes" target="_blank">version 0.81-RC </a> + <a href="http://code.google.com/p/bigbluebutton/wiki/ReleaseNotes" title="BigBlueButton Release Notes" target="_blank">version 0.81-RC2</a> </p> </div> <!-- Footer End --> diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index 0fbe96a15e9407dff162896852e005b6323b2c9a..3ad674d847c5323f9d783c7e706035646ae5db49 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -77,7 +77,7 @@ defaultDialAccessNumber=613-555-1234 # conference. This is only used for the old scheduling which will be # removed in the future. Use the API to create a conference. defaultWelcomeMessage=<br>Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href="event:http://www.bigbluebutton.org/content/videos"><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the headset icon (upper-left hand corner). Use a headset to avoid causing background noise for others.<br> -defaultWelcomeMessageFooter=This server is running a <a href="https://code.google.com/p/bigbluebutton/wiki/081Overview" target="_blank"><u>BigBlueButton 0.81-RC</u></a>. +defaultWelcomeMessageFooter=This server is running a <a href="https://code.google.com/p/bigbluebutton/wiki/081Overview" target="_blank"><u>BigBlueButton 0.81-RC2</u></a>. # Default maximum number of users a meeting can have. # Doesn't get enforced yet but is the default value when the create