Skip to content

Commit

Permalink
Bumping version to 1.1.1-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
dryswabbie committed Oct 20, 2016
1 parent 3cc82ca commit 613e92b
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 67 deletions.
124 changes: 62 additions & 62 deletions api/easyrtc.js
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
/* global define, module, require */
/*!
Script: easyrtc_lang.js
Provides lang file.
About: License
Copyright (c) 2016, Priologic Software Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
//RequireJS (AMD) build system
define('easyrtc_lang',factory);
} else if (typeof module === 'object' && module.exports) {
//CommonJS build system
module.exports = factory();
} else {
root.easyrtc_lang = factory();
}
}(this, function (undefined) {

"use strict";

return {
"unableToEnterRoom":"Unable to enter room {0} because {1}" ,
"resolutionWarning": "Requested video size of {0}x{1} but got size of {2}x{3}",
"badUserName": "Illegal username {0}",
"localMediaError": "Error getting local media stream: {0}",
"miscSignalError": "Miscellaneous error from signalling server. It may be ignorable.",
"noServer": "Unable to reach the EasyRTC signalling server.",
"badsocket": "Socket.io connect event fired with bad websocket.",
"icf": "Internal communications failure",
"statsNotSupported":"call statistics not supported by this browser, try Chrome.",
"noWebrtcSupport":"Your browser doesn't appear to support WebRTC.",
"gumFailed":"Failed to get access to local media. Error code was {0}.",
"requireAudioOrVideo":"At least one of audio and video must be provided"
};

/* global define, module, require */
/*!
Script: easyrtc_lang.js
Provides lang file.
About: License
Copyright (c) 2016, Priologic Software Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
//RequireJS (AMD) build system
define('easyrtc_lang',factory);
} else if (typeof module === 'object' && module.exports) {
//CommonJS build system
module.exports = factory();
} else {
root.easyrtc_lang = factory();
}
}(this, function (undefined) {

"use strict";

return {
"unableToEnterRoom":"Unable to enter room {0} because {1}" ,
"resolutionWarning": "Requested video size of {0}x{1} but got size of {2}x{3}",
"badUserName": "Illegal username {0}",
"localMediaError": "Error getting local media stream: {0}",
"miscSignalError": "Miscellaneous error from signalling server. It may be ignorable.",
"noServer": "Unable to reach the EasyRTC signalling server.",
"badsocket": "Socket.io connect event fired with bad websocket.",
"icf": "Internal communications failure",
"statsNotSupported":"call statistics not supported by this browser, try Chrome.",
"noWebrtcSupport":"Your browser doesn't appear to support WebRTC.",
"gumFailed":"Failed to get access to local media. Error code was {0}.",
"requireAudioOrVideo":"At least one of audio and video must be provided"
};

}));
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define('webrtc-adapter',[],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.adapter = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/* eslint-env node */
Expand Down Expand Up @@ -3071,7 +3071,7 @@ var Easyrtc = function() {
SIGNAL_ERR: "SIGNAL_ERR"
};

this.apiVersion = "1.1.0";
this.apiVersion = "1.1.1-beta";

/** Most basic message acknowledgment object */
this.ackMessage = {msgType: "ack"};
Expand Down
2 changes: 1 addition & 1 deletion api/easyrtc_int.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ var Easyrtc = function() {
SIGNAL_ERR: "SIGNAL_ERR"
};

this.apiVersion = "1.1.0";
this.apiVersion = "1.1.1-beta";

/** Most basic message acknowledgment object */
this.ackMessage = {msgType: "ack"};
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "easyrtc",
"main": "api/easyrtc.js",
"version": "1.1.0",
"version": "1.1.1-beta",
"homepage": "http://easyrtc.com/",
"authors": [
"Rod Apeldoorn <rod.apeldoorn@priologic.com>",
Expand Down
2 changes: 1 addition & 1 deletion docs/client_html_docs/easyrtc_int.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ <h1 class="page-title">Source: easyrtc_int.js</h1>
SIGNAL_ERR: "SIGNAL_ERR"
};

this.apiVersion = "1.1.0";
this.apiVersion = "1.1.1-beta";

/** Most basic message acknowledgment object */
this.ackMessage = {msgType: "ack"};
Expand Down
11 changes: 10 additions & 1 deletion docs/easyrtc_changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
EasyRTC: Change Log
===================

v1.1.1-beta
-------
New Features:

Changes:

Fixes:


v1.1.0
-------
New Features:
Expand All @@ -21,7 +30,7 @@ Changes:
- Documentation - Updated link to EasyRTC forum.
- Documentation - Updated README to include bower install step.
- Documentation - Updated docs to reflect the ../ reference in server.js and the need to run https servers.

Fixes:
- JS Client - Fixed file sharing demo.
- JS Client - Put a guard on onPeerClosed.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "easyrtc",
"version": "1.1.0",
"version": "1.1.1-beta",
"homepage": "http://www.easyrtc.com/",
"author": "Priologic Software Inc. <info@priologic.com> (http://priologic.com/)",
"description": "EasyRTC enables quick development of webRTC",
Expand Down

0 comments on commit 613e92b

Please sign in to comment.