bigbluebutton-Github/bigbluebutton-html5/imports/api
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
..
breakouts Update breakout rooms in html5 2016-11-14 09:57:10 -02:00
captions Changed CC's split limit to 1,000 characters 2016-08-20 19:57:28 -07:00
chat Merge branch 'master' into refactor-meetings-api 2016-10-24 11:14:14 +00:00
common/server Refactor Meeting API 2016-10-21 16:27:47 +00:00
cursor Changed update to upsert for the cursor updates 2016-08-20 20:30:38 -07:00
deskshare Minor corrections 2016-08-22 08:34:46 -07:00
FontControl Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05:00
meetings Fix import in stunturn reply handler 2016-11-03 17:23:00 +00:00
phone Added exiting audio 2016-10-25 14:16:40 -07:00
polls HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
presentations HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
shapes Fix handler for 'get_whiteboard_shapes_reply' not calling the cb 2016-10-14 16:18:54 +00:00
slides fix bug related to change presentation 2016-08-25 15:57:31 +00:00
users Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00
verto Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-19 13:50:14 -07:00