bigbluebutton-Github/bigbluebutton-html5
Gabriel Carvalho de Campes 3f53620416 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
* upstream/master: (22 commits)
  - create only one netConnection to bbb-apps. Not re-create one when reconnecting.
  - log client out when user is ejected from meeting.
  - reset connectAttemptTimeout as we don't want to fail connection on reconnects.
  - fix rtmpt
  - add more logging to track issues
  Update Gemfile.lock for 1.1-dev
  - log locale version
  - remove user join log
  improve logs for webrtc events
  - improve client side logging.
  add EN string to ClientStatusEvent
  Updated restart of libreoffice for systemd
  - add log to indicate successful connection to bbb-apss
  bbb-web: Escaped strings used in freemarker template for thumbnails
  record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
  Fix import in stunturn reply handler
  Fix handleStunTurnReply function name
  Clean up before PR
  Rever wrong changes on chat handler parameters
  Revert wrong changes on chat handler name
  ...
2016-11-14 10:00:42 -02:00
..
.meteor Update breakout rooms in html5 2016-11-14 09:57:10 -02:00
client Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
imports Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 2016-11-14 10:00:42 -02:00
log move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
private/config added html5 stun request and reply 2016-10-25 07:59:14 -07:00
public Reworked modal to dynamically change content 2016-10-12 12:55:02 -07:00
server Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 2016-11-14 10:00:42 -02:00
tests Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
.gitignore HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js 2016-08-23 14:35:28 -07:00
.jscsrc Incorporated linting into the build process. 2016-04-06 10:06:08 -03:00
grunt-instructions.txt Updated the instructions on running Grunt. 2016-04-06 10:08:33 -03:00
Gruntfile.js HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js 2016-08-23 14:35:28 -07:00
package.json Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
start.sh clean up 2016-08-24 23:13:42 +00:00