Skip to content
Snippets Groups Projects
Commit c1d0797d authored by Oswaldo Acauan's avatar Oswaldo Acauan
Browse files

Merge remote-tracking branch 'upstream/master' into refactor-api-users

* upstream/master: (47 commits)
  Added ExitApplicationEvent.as
  HTML 5 - changed css for divider
  No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
  Link "enableEmojiStatus" enabled/disabled to the emoji button.
  initialize html5StunTurn properly - complication from PR 3628
  fix bug preventing stun/turn call
  fix lint issues
  rework userPermissions to allow mixture of role/status based actions
  Handle exception when sending message to client
  HTML5 - changed divider of record button
  Change the emoji menu icon to the happy face.
  don't show promote option for presenter user'
  remove glow prop and use className to change style
  reorganize user actions
  clean up
  improve userPermissions by rearranging logic
  allow for mute/unmute by moderator
  rename css class
  Display breakout rooms user names in row tooltip.
  fix setPresenter and kick user
  ...
parents 28ba2fb4 aafc429e
No related branches found
No related tags found
No related merge requests found
Showing
with 193 additions and 99 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment