Skip to content

Commit

Permalink
Merge pull request #502 from opentok/develop
Browse files Browse the repository at this point in the history
This release contains:
- Changes to allow users to toggle cameras from within the app instead of through the browser
- Selecting a microphone from within the app instead of through the browser
- Design changes to make client endpoints work more reliably from within China
- Ability to send feedback to a configurable URL
- Ability to run the precall test with a different key/secret pair
  • Loading branch information
rhainer authored Mar 28, 2019
2 parents d31b7bf + 58c3918 commit 3540a25
Show file tree
Hide file tree
Showing 49 changed files with 5,339 additions and 5,398 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ build/Release
/web/css/*
!/web/css/buttons.css
!/web/css/checkboxes.css
!/web/css/fonts.css

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,13 @@ The app lets the developer POST feedback data to an endpoint on your HTTP server

We don't allow restricting iframe loading to specific URIs because it doesn't work on Chrome.

* `USE_GOOGLE_FONTS` (Optional, default value: true): Whether the client app will load
the Open Sans font (the main font used in the user interface) from the Google font library
(fonts.googleapis.com) or not.

* `JQUERY_URL` (Optional, default value: 'https://ajax.googleapis.com/ajax/libs/jquery/'):
Route of the CDN that will be used to load JQuery scripts.

## Customizing the UI

For information on how to customize OpenTokRTC's UI, see [CUSTOMIZING-UI.md](CUSTOMIZING-UI.md).
Expand Down
42 changes: 42 additions & 0 deletions api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,48 @@ paths:
description: Failed health check
schema:
$ref: '#/definitions/HealthInfo'
/saveConnection:
post:
summary: Callback to store a new connection in Firebase.
x-implemented-in: saveConnectionFirebase
description: Adds a new connection in the corresponding session in Firebase.
parameters:
- name: connection
in: body
description: The connection to be stored.
required: true
type: string
- name: sessionId
in: body
description: The sessionId of the connection.
required: true
type: string
tags:
- Firebase
responses:
'200':
description: OK
/deleteConnection:
post:
summary: Callback to delete a inactive connection from Firebase.
x-implemented-in: deleteConnectionFirebase
description: Deletes a connection in the corresponding session in Firebase.
parameters:
- name: connection
in: body
description: The connection to be deleted.
required: true
type: string
- name: sessionId
in: body
description: The sessionId of the connection.
required: true
type: string
tags:
- Firebase
responses:
'200':
description: OK
definitions:
RoomHTML:
type: string
Expand Down
4 changes: 3 additions & 1 deletion config/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@
"Google": {
"clientId": "yourClientId.apps.googleusercontent.com",
"hostedDomain": "yourhosteddomain.com"
}
},
"useGoogleFonts": true,
"jqueryUrl": "https://ajax.googleapis.com/ajax/libs/jquery"
}
Loading

0 comments on commit 3540a25

Please sign in to comment.