BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,460 Commits 13 Branches 260 Tags 1.1 GiB
8c60d03ccc
Commit Graph

1093 Commits

Author SHA1 Message Date
Tainan Felipe
7dc251fc5a add treater of webrtc error 2018-06-27 10:56:03 -03:00
Anton Georgiev
79329d036a set dial-in clientType in html5 client 2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d add clientType in User and show it in api getMeeting* 2018-06-22 19:19:46 +00:00
Anton Georgiev
3546e49379 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3 2018-06-20 16:02:06 +00:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Anton Georgiev
634b7b34c7 avoid referencing null on user leave 2018-06-19 15:38:53 +00:00
Tainan Felipe
2dbfe499cc rename variable 2018-06-18 15:59:35 -03:00
Tainan Felipe
9e9e85cddb skip share/unshare webcam using if not check 2018-06-18 15:35:27 -03:00
Anton Georgiev
ad483dd0e5
Merge pull request #5702 from Tainan404/issue-5692 
Skip userLeaving when meeting is gone.
 2018-06-15 16:26:04 -04:00
Tainan Felipe
d5482651d9 rename variable 2018-06-15 17:24:03 -03:00
Tainan Felipe
f86d80c53d Remove skip userLeaving and change throw to log 2018-06-15 16:28:19 -03:00
Tainan Felipe
3884d45e5d skip userLeaving when meeting is ended 2018-06-15 15:16:05 -03:00
JamesJung
0fa7810e34 Add userName to the log sent from client to server (#5535) 
Fix for #5454
 2018-06-15 09:45:58 -03:00
Anton Georgiev
7338086572 Do not auth validate Flash users (#5695) 
by @oswaldoacauan
 2018-06-14 17:24:55 -03:00
Anton Georgiev
f38271b3f8 pass correct structure for TURNs 2018-06-11 20:20:32 +00:00
Anton Georgiev
de7977122c fix incorrectly picked breakout expiration time 2018-06-11 16:05:53 +00:00
Anton Georgiev
fd563c2577 make default breakouts expiration time 15 mins, not 15 sec 2018-06-11 16:05:53 +00:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Anton Georgiev
d8372fa2a2 cleanup 2018-06-07 16:13:20 +00:00
Anton Georgiev
bbaca66e94 adjust to handle redirectURL being overwritten 2018-06-07 15:59:06 +00:00
Anton Georgiev
eb7a49f142 renamed noRedirect* to redirectToHtml5* 2018-06-07 15:59:06 +00:00
Anton Georgiev
a77ee38741 make breakout url for html5 and use it 2018-06-07 15:59:06 +00:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818 Clean up 2018-05-30 11:19:19 -03:00
Anton Georgiev
f13d37867e
Merge pull request #5601 from BobakOftadeh/ui-userlist-changes 
User list UI changes implemented
 2018-05-29 16:41:20 -04:00
Bobak Oftadeh
136fa72a7e User list UI changes implemented 2018-05-29 12:23:13 -07:00
Anton Georgiev
06ad7805a4
Merge pull request #5583 from antobinary/adjust-api 
Revert special api changes made for html5 client
 2018-05-28 17:46:30 -04:00
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status 
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
 2018-05-28 13:55:30 -04:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00:00
Maxim Khlobystov
a0497b2dd9 Assign server time to outgoing chat messages. 2018-05-15 16:08:30 -04:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen 
Implement feedback screen
 2018-05-14 10:19:53 -04:00
Lucas Fialho Zawacki
85362e59b8 Remove now unecessary messages sent from HTML5 server 2018-05-10 17:38:30 +00:00
Lucas Fialho Zawacki
2d222b7b2e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status 2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
c2801f4476 Send userId as calername in screenshare instead of username 2018-05-09 18:48:14 +00:00
Tainan Felipe
c4c0930317 remove log 2018-05-09 15:12:51 -03:00
Anton Georgiev
f501565e41 adjust meeting props to add freeJoin br room 2018-05-08 17:47:55 +00:00
Tainan Felipe
10a90b4180 WIP 2018-05-08 13:30:00 -03:00
prlanzarin
37564a0c6f Fixed userName/userId usage in kurento-extension 2018-05-07 17:17:48 +00:00
prlanzarin
4a9ba0b37a Added kurento audio bridge callbacks and sip.js depency to SFU 2018-05-07 13:39:39 +00:00
prlanzarin
c2143f9a50 Added first working versions of join/exitAudio for kurento bridge and fixed SFU session termination for freeswitch adapter 2018-04-29 00:18:54 +00:00
prlanzarin
47120111dd Fixed adapter calls in SFU and added bridge hooks for kurento listen only 2018-04-27 21:37:41 +00:00
Fred Dixon
46e9fecdad
Merge pull request #5420 from antobinary/default-chrome-extension 
Set default KEY and LINK for Chrome screenshare extension
 2018-04-26 19:13:52 -04:00
Anton Georgiev
6aea0b6297 add custom vs default key and link 2018-04-26 22:52:46 +00:00
Lucas Fialho Zawacki
a2b670174b Merge branch 'final-recordings' into html5-video-recording 2018-04-26 16:43:18 +00:00
Lucas Fialho Zawacki
ebef86abbe Respcect the recorded=false authority 2018-04-26 01:52:48 +00:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations" 2018-04-25 20:41:19 -04:00
Anton Georgiev
44fde9a83c
Merge pull request #5400 from MaximKhlobystov/whiteboard-bulk-upsert 
[HTML5 Client] Whiteboard Bulk Operations
 2018-04-25 18:03:52 -04:00
Maxim Khlobystov
4db94b4489 Some cleanup and code optimizations. 2018-04-25 15:15:36 +00:00
Maxim Khlobystov
fd0c1bf164 Fixed a small misprint in DRAW_END logic. 2018-04-25 14:52:03 +00:00
Maxim Khlobystov
4067f5f808 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert 2018-04-25 14:39:48 +00:00
João Francisco Siebel
9e2d517052 add user verification and narrow down search 2018-04-25 11:29:55 -03:00
João Francisco Siebel
742303015d handle only HTML5 direct messages ignoring flash messages 2018-04-24 15:42:59 -03:00
Maxim Khlobystov
9e4da16e8f Brought text shapes back. 2018-04-24 18:17:55 +00:00
Maxim Khlobystov
4ef8f0d0c6 Moved pencil to bulk updates. 2018-04-24 13:59:13 +00:00
Anton Georgiev
7d95d06f59
Merge pull request #5342 from Tainan404/issue-5332 
Don't handle flash client direct messages in html5 client.
 2018-04-23 14:13:27 -04:00
Tainan Felipe
be0ce09af0 pass message for allowed functions 2018-04-23 09:30:14 -03:00
João Francisco Siebel
f122fc5a4b Fix problem in firefox on joining audio 2018-04-18 11:15:17 -03:00
Tainan Felipe
a5ddb4bd17 rename function of skipFlashDirectEvent to processForHTML5ServerOnly 2018-04-13 16:26:58 -03:00
João Francisco Siebel
16788eed87 Remove all media tracks on exit audio 2018-04-13 09:39:26 -03:00
Maxim Khlobystov
c7b1d4c704 Dropping some comon shape updates related to the same shape. 2018-04-12 17:13:40 -04:00
Tainan Felipe
d9f90943ee Skip direct messages of flash client 2018-04-12 13:25:54 -03:00
Oleksandr Zhurbenko
68aba8e0a2 Ajusted multi-user change to the new message format 2018-04-11 13:50:00 -07:00
Oleksandr Zhurbenko
0ae0d56348 Adjusted switchSlide to the new message format 2018-04-11 13:05:30 -07:00
Tainan Felipe
d259a875f6 remove duplicated code in whiteboard-multi-user api 2018-04-11 16:37:46 -03:00
Oleksandr Zhurbenko
6045dfd1bc Ignoring annotation history messages that don't target Meteor 2018-04-10 16:49:56 -07:00
Oleksandr Zhurbenko
4afc455e8a Corrected indexing for Slides, Presentation, Pods, and Annotations 2018-04-10 16:27:11 -07:00
Oleksandr Zhurbenko
a39700bc79 Corrected cursor messages, added whiteboardId 2018-04-09 23:08:23 -07:00
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oleksandr Zhurbenko
a3f21ee1ce Adjustments to support presentation pods in 2.1 2018-04-09 12:48:37 -07:00
Oleksandr Zhurbenko
f4ab6b76f3 Corrected handlers.js 2018-04-05 15:31:39 -07:00
Oleksandr Zhurbenko
df98f394dd Handle SyncGetPresentationPods 2018-04-05 15:29:58 -07:00
Oleksandr Zhurbenko
69d8dedaab Corrected the collection name 2018-04-05 15:00:52 -07:00
Oleksandr Zhurbenko
b2708d2a2a Handling SetPresenterInPod 2018-04-05 14:04:27 -07:00
Oleksandr Zhurbenko
65cf1d6c16 Handle RemovePresentationPod 2018-04-05 13:56:41 -07:00
Maxim Khlobystov
fa58101039 Added time-based grouping for common shapes upserting. 2018-04-05 16:19:41 -04:00
Oleksandr Zhurbenko
e5a4bd09b4 Handle CreateNewPresentationPod message 2018-04-05 12:59:26 -07:00
Anton Georgiev
2f0a33b738
Merge pull request #5296 from oswaldoacauan/fix-5183 
Sends a ejectUserFromVoice after removing a user
 2018-04-03 13:26:30 -04:00
Oswaldo Acauan
9802dc73af Improve ice connection event handlers 2018-04-03 13:49:45 -03:00
Oswaldo Acauan
3d74ad4847 Add event handlers for iceConnection errors 2018-04-03 10:50:18 -03:00
João Francisco Siebel
2ff45a9d7f Rename function name to match his functionality 2018-04-02 14:08:25 -03:00
Oswaldo Acauan
04b98036e7 Sends a ejectUserFromVoice after removing a user 
Fix wrong linter change
 2018-04-02 11:42:13 -03:00
João Francisco Siebel
c598270663 Enforce authToken to re-joining users, resolve #5261 2018-03-29 09:10:30 -03:00
Anton Georgiev
e1fc9a237e resolve "CLIENT LOG: [object Object]" 2018-03-21 19:39:11 +00:00
Anton Georgiev
07b867e52c
Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users 
Fix ghost and reconnecting users
 2018-03-19 14:07:46 -04:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Oswaldo Acauan
16a61a891d Move userLeft out of subscription stop to socket close event. Closes #5240 2018-03-16 16:18:10 -03:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Anton Georgiev
d17ca71a60
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5 
Implement start stop recording html5
 2018-03-09 14:28:14 -05:00
Oswaldo Acauan
8b9cc79c3d Implement basic GroupChat messages. Closes #4987 2018-03-09 15:42:14 -03:00
Anton Georgiev
9d7d8edbe0 improve isDialInUser function - use same var 2018-03-07 11:42:13 -05:00
Anton Georgiev
89b7da5be2 resolve conflicting double definition of voiceUserId 2018-03-07 11:18:02 -05:00
Anton Georgiev
2abcb91a7f increase voice user logging level in production 2018-03-07 11:18:02 -05:00
João Francisco Siebel
efbf830e31 Change recording indicator to match #5127 changes 2018-02-23 13:26:33 -03:00
João Francisco Siebel
8f43508b4f Linter some code and simplify action button logic display 2018-02-20 15:23:35 -03:00
Oswaldo Acauan
b03966d0d1 Close all user connections when removed 2018-02-20 12:02:04 -03:00
Oswaldo Acauan
8219c28084 Remove debug code 2018-02-20 11:59:47 -03:00
Oswaldo Acauan
3d69023308 Add check for connection and validated status. Fix #5152 2018-02-20 11:37:17 -03:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150 
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
 2018-02-20 11:26:36 -03:00
João Francisco Siebel
c2076c5260 Fix logic for showing start/end recording 2018-02-19 13:30:21 -03:00
João Francisco Siebel
919c2aa644 Implement start/stop recording logic 2018-02-15 17:42:50 -02:00
Anton Georgiev
32abdc8344
Merge pull request #5102 from MaximKhlobystov/handle-reconnected-voice-users 
[HTML5 Client] Adjustments in handling of reconnected voice users
 2018-02-09 14:50:32 -05:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
Oleksandr Zhurbenko
dddc388a10 Fixed an exception thrown on meeting destruction 2018-02-07 14:57:34 -08:00
Maxim Khlobystov
82a40e4d9a Handle voice users message to update the voice states properly on reconnect. 2018-02-06 11:23:51 -05:00
Tainan Felipe Pauli de Almeida
38e3ce3013 Merge remote-tracking branch 'upstream/v2.0.x-release' into lock-settings 2018-02-06 13:21:22 -02:00
Tainan Felipe Pauli de Almeida
bc2da51bfb Comply lock setting 'Hide other viewer's webcams' 2018-02-06 09:43:14 -02:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix 
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
 2018-01-16 13:39:38 -02:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05:00
Anton Georgiev
44cf02424f Adjust user guesStatus User property to handle join in BBB 2.1 
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
 2018-01-11 15:05:19 -05:00
Anton Georgiev
cf921edd8b Merge branch 'issue-4812' of github.com:oswaldoacauan/bigbluebutton into html5-on-2.1-take-2 2018-01-11 14:19:05 -05:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix 
Ghost flash webcams fix
 2018-01-08 10:18:52 -08:00
Oleksandr Zhurbenko
2de02c4f8d Linting 2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
Anton Georgiev
f0e15af607
Merge pull request #4814 from oswaldoacauan/issue-4812 
Simplify authentication code/flow and Add subscriptions error handling
 2018-01-03 14:45:38 -02:00
Anton Georgiev
c9379eaa0f add muteOnStart param in Meeting structure 2017-12-22 15:22:24 -05:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700 
Improvements on Presentation Management
 2017-12-15 19:03:54 -02:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3 
Handle dial-in users in HTML5
 2017-12-15 13:44:51 -02:00
Oswaldo Acauan
0c89d81675 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-4812 2017-12-15 09:13:26 -02:00
Oswaldo Acauan
62454b826b Remove duplicated log 2017-12-13 16:20:29 -02:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
prlanzarin
bdc89e0830 Refactored webcam share/unshare handlers 2017-12-08 16:52:37 +00:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
Anton Georgiev
9f1a80078c handle join and leave of call-in user 2017-12-07 15:50:50 -05:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear 
Localize message from when clear the chat.
 2017-12-07 18:27:55 -02:00
Anton Georgiev
255d64d430
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes 
Audio bugfixes and improvements
 2017-12-05 17:17:35 -02:00
Anton Georgiev
e5060ea6b4
Merge pull request #4734 from OZhurbenko/presenter-functionality-2x 
Whiteboard touch events support, bug fixes, improvements
 2017-12-04 18:59:59 -02:00
Oswaldo Acauan
807bd99f82 Fix stuck state on conversion failure 2017-11-28 10:26:00 -02:00
Oleksandr Zhurbenko
006b7c7af6 Corrected logging for the clearAnnotations method 2017-11-27 11:23:38 -08:00
Oswaldo Acauan
e8de534964 Add error handling on presentation upload and covnersion 2017-11-27 15:44:45 -02:00
Anton Georgiev
64f2613818 send requesterId rather than userId on request to akka-aps 2017-11-24 17:03:17 -05:00
Anton Georgiev
a73f5ec738 send muted boolean on user (un)mute 2017-11-24 17:02:14 -05:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import 
Added chrome extension ID to HTML5 screenshare call
 2017-11-17 18:55:59 +00:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
Gabriel Carvalho de Campes
36c9d85749 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-11-16 09:13:47 -02:00
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config 
add moderatorUnmute feature in HTML5 client
 2017-11-14 16:49:41 -02:00