Skip to content

Commit

Permalink
Merge pull request #283 from Temasys/0.6.x/development
Browse files Browse the repository at this point in the history
Release 0.6.20
  • Loading branch information
ncurrier authored Apr 18, 2017
2 parents 5a6a4f8 + a3b46de commit a581c2a
Show file tree
Hide file tree
Showing 37 changed files with 886 additions and 622 deletions.
5 changes: 1 addition & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ module.exports = function(grunt) {
uglify: {
options: {
mangle: false,
drop_console: true,
compress: {
drop_console: true
},
compress: {},
banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %> */\n'
},
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> Temasys Web SDK (formerly SkylinkJS) is an open-source client-side library for your web-browser that enables any website to easily leverage the capabilities of WebRTC and its direct data streaming powers between peers for audio/video conferencing or file transfer.
We've gone to great length to make this library work in as many browsers as possible. Temasys Web SDK is built on top of [AdapterJS](http://github.com/Temasys/AdapterJS) and works with our [Temasys WebRTC Plugin](http://skylink.io/plugin/) even in Internet Explorer and Safari on Mac and PC.
We've gone to great length to make this library work in as many browsers as possible. Temasys Web SDK is built on top of [AdapterJS](http://github.com/Temasys/AdapterJS) and works with our [Temasys WebRTC Plugin](http://temasys.io/plugin/) even in Internet Explorer and Safari on Mac and PC.

You'll need a Temasys Account and an App key to use this. [Register here to get your App key](https://console.temasys.io).

Expand All @@ -15,14 +15,14 @@ You'll need a Temasys Account and an App key to use this. [Register here to get
| -------------- | ---------- | ----------- | --------- | ---------- | ---------- | ---- | ----- |
| **Platforms:** | Win/Mac/Ubuntu/Android | Win/Mac/Ubuntu/Android | Win/Mac/Ubuntu/Android | Win/Mac | Win | Mac | Win | iOS<br>(`9.x` and below) |
| **Screensharing** | Yes with [Chrome Extension**](https://chrome.google.com/webstore/detail/skylink-webrtc-tools/ljckddiekopnnjoeaiofddfhgnbdoafc) | Yes with [Firefox Extension**](https://addons.mozilla.org/en-US/firefox/addon/skylink-webrtc-tools/) | - | Yes with [Commercial Temasys Plugin*](https://temasys.io/plugin/#commercial-licensing) | Yes with [Commercial Temasys Plugin*](https://temasys.io/plugin/#commercial-licensing) | No | No |
| **Video Call** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes [Temasys Plugin](http://skylink.io/plugin/) | Yes (with H264 flag enabled) | Yes |
| **Audio Call** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes (no MCU) | Yes (no MCU) |
| **File Transfers** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes with [Temasys Plugin](http://skylink.io/plugin/) | No | No |
| **Chat Messaging** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes with [Temasys Plugin](http://skylink.io/plugin/) | Yes (Signaling only) | Yes (Signaling only) |
| **Video Call** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes [Temasys Plugin](http://temasys.io/plugin/) | Yes (with H264 flag enabled) | Yes |
| **Audio Call** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes (no MCU) | Yes (no MCU) |
| **File Transfers** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes with [Temasys Plugin](http://temasys.io/plugin/) | No | No |
| **Chat Messaging** | Yes | Yes | Yes | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes with [Temasys Plugin](http://temasys.io/plugin/) | Yes (Signaling only) | Yes (Signaling only) |

- (+) Latest browser versions indicates the last tested browser version. It should work with the updated next versions, but if it doesn't, open a bug ticket.
- (*) Custom Branded Temasys WebRTC Plugin incorporates additional features not available in the free plugin.
- (**) Our extensions works with Temasys demos and localhost demos. You will have to modify the extension to work on your hosted Web Applications. For Chrome extensions source code, [contact us](http://support.temasys.com.sg). For Firefox extensions source code, [you may download from your Application Key in console.temasys.io](https://console.temasys.io).
- (**) Our extensions works with Temasys demos and localhost demos. You will have to modify the extension to work on your hosted Web Applications. For Chrome extensions source code, [contact us](http://support.temasys.io). For Firefox extensions source code, [you may download from your Application Key in console.temasys.io](https://console.temasys.io).

##### Installation
Install Temasys Web SDK (formerly SkylinkJS) with [npm](https://www.npmjs.com/):
Expand Down Expand Up @@ -51,7 +51,7 @@ You can raise tickets on [our support portal](http://support.temasys.io) or on [
##### Current versions and stability
We recommend that you always use the latest versions of the Temasys Web SDK as WebRTC is still evolving and we adapt to changes very frequently.

[Latest version: `0.6.19`](https://github.com/Temasys/SkylinkJS/releases/tag/0.6.19).
[Latest version: `0.6.20`](https://github.com/Temasys/SkylinkJS/releases/tag/0.6.20).

#### Noted Issues and Solutions
##### Installing `0.6.3` - `0.6.10` versions in NPM
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "skylinkjs",
"description": "WebRTC real-time video conversation library",
"version": "0.6.19",
"homepage": "https://skylink.io",
"version": "0.6.20",
"homepage": "https://temasys.io",
"author": {
"name": "Temasys Communications Pte. Ltd.",
"email": "info@temasys.com.sg"
"email": "info@temasys.io"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions demo/edge-attachmediastream.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* And Edge current does not support re-negotiation for now in the SDK.
*/
(function () {
if (window.webrtcDetectedBrowser === 'edge') {
if (window.webrtcDetectedBrowser === 'edge' && window.webrtcDetectedBrowser < 15.15019) {
var attachMediaStream_base = attachMediaStream;

attachMediaStream = function (elm, stream) {
Expand All @@ -29,7 +29,7 @@
audioElm.style.height = 0;
audioElm.style.width = 0;
audioElm.autoplay = true;
audioElm.muted = !!elm.getAttribute('muted');
audioElm.muted = !!elm.muted;

document.body.appendChild(audioElm);

Expand Down
10 changes: 5 additions & 5 deletions doc-style/partials/sidebar.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Getting Started Examples <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="https://temasys.com.sg/getting-started-with-webrtc-and-skylinkjs/">Setting up a Video Call</a></li>
<li><a href="https://temasys.com.sg/screensharing-with-skylinkjs/">Setting up Screensharing</a></li>
<li><a href="https://temasys.com.sg/building-a-simple-peer-to-peer-webrtc-chat/">Setting up a Chatroom</a></li>
<li><a href="https://temasys.io/getting-started-with-webrtc-and-skylinkjs/">Setting up a Video Call</a></li>
<li><a href="https://temasys.io/screensharing-with-skylinkjs/">Setting up Screensharing</a></li>
<li><a href="https://temasys.io/building-a-simple-peer-to-peer-webrtc-chat/">Setting up a Chatroom</a></li>
</ul>
</li>
{{#classes}}
Expand All @@ -18,8 +18,8 @@
{{/classes}}
</ul>
</li>-->
<li><a class="btn btn-info btn-navbar" href="http://developer.temasys.com.sg/">Developer Console</a></li>
<li><a class="btn btn-info btn-navbar" href="http://support.temasys.com.sg/">Support</a></li>
<li><a class="btn btn-info btn-navbar" href="https://console.temasys.io/">Developer Console</a></li>
<li><a class="btn btn-info btn-navbar" href="http://support.temasys.io/">Support</a></li>
<!--<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Modules <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
Expand Down
Loading

0 comments on commit a581c2a

Please sign in to comment.