BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,392 Commits 13 Branches 260 Tags 1.1 GiB
a0368e55cf
Commit Graph

17392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaus
a0368e55cf Fix voiceUser mic states 2017-08-02 10:11:53 -03:00
Richard Alam
ae788b9b1d Merge branch 'capilkey-restrict-remote-layout' into bbb-2x-mconf 2017-08-01 17:48:10 -07:00
Richard Alam
4889f66361 Merge branch 'restrict-remote-layout' of https://github.com/capilkey/bigbluebutton into capilkey-restrict-remote-layout 2017-08-01 17:35:47 -07:00
Chad Pilkey
89ea33359c only apply remote layouts to non-moderators 2017-08-01 18:51:20 -04:00
Richard Alam
fd901bafa9 Merge pull request #4186 from ritzalam/fix-presentation-late-joiner 
- fix issue where late joiners displays the wrong slide
 2017-08-01 17:52:33 -04:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Anton Georgiev
1bafb292cb Merge pull request #4169 from oswaldoacauan/meteor-1.5.1 
[HTML5] Update Meteor to 1.5.1
 2017-08-01 15:27:26 -04:00
Anton Georgiev
64b597c420 Merge pull request #4179 from Klauswk/html5-2x-voice-user 
[HTML5 2.0] Move AudioUsers to his own Collection
 2017-08-01 14:38:26 -04:00
Richard Alam
216932eff8 Merge pull request #4185 from ritzalam/remove-bbb-user2x-bind-warnings 
- remove binding warnings
 2017-08-01 14:32:50 -04:00
Richard Alam
629939ccc7 - remove binding warnings 2017-08-01 11:31:39 -07:00
Klaus
0a9abf6273 Remove user.listenOnly 2017-08-01 14:02:41 -03:00
Fred Dixon
52fefdb6d6 Merge pull request #4183 from riadvice/2x-client-theme 
Fix presentation conversion pages number and setting to current.
 2017-08-01 13:53:26 -03:00
Ghazi Triki
a760d93c9f Fix presentation conversion pages number and setting to current. 2017-08-01 17:50:50 +01:00
Klaus
6cc46b8627 Add const to voiceUser 2017-08-01 13:04:20 -03:00
Klaus
fc6713013a Move method to VoiceUser 2017-08-01 12:00:07 -03:00
Anton Georgiev
04a7781ea6 Merge pull request #4172 from mmarangoni/call-manager 
[HTML5] Remove audio API duplication & Join Audio fix
 2017-08-01 10:23:09 -04:00
Klaus
ed7d9a3a63 Change wrong log 2017-08-01 10:55:00 -03:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Anton Georgiev
c0b940b063 Merge pull request #4173 from antobinary/fix-presentation 
[HTML5 2.0] Handle PresentationConversionCompletedEvtMsg
 2017-08-01 09:20:35 -04:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Fred Dixon
fcd8de96d8 Merge pull request #4178 from riadvice/2x-client-theme 
[Flash 2.0] - Revert WebRTCEchoTest yes button click handler
 2017-08-01 09:32:04 -03:00
Ghazi Triki
9ebd4468cc Revert WebRTCEchoTest yes button click handler removed by mistake. 2017-08-01 11:21:34 +01:00
Richard Alam
3adfe4bf33 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-31 18:00:39 -07:00
Richard Alam
775ac013fd Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-31 17:58:03 -07:00
Chad Pilkey
ca67f74b9c Merge pull request #4177 from capilkey/fix-akka-layout-model 
Make layout data instance based instead of static
 2017-07-31 19:05:24 -04:00
Chad Pilkey
c8caf39d50 make layout data instance based instead of static 2017-07-31 19:02:45 -04:00
Ghazi Triki
9f0536c18b Align users action buttons to the right. 2017-07-31 23:22:40 +01:00
Chad Pilkey
9acbbd1026 Merge pull request #4175 from capilkey/2.0-message-recording 
Remove broken parts of getRecordings response building
 2017-07-31 18:16:15 -04:00
Chad Pilkey
e4350f10a9 remove broken parts of getRecordings response building 2017-07-31 18:13:09 -04:00
Ghazi Triki
8735eecb89 Updated whiteboard curors to be black and white. 2017-07-31 23:00:46 +01:00
Richard Alam
3b66358555 Merge pull request #4174 from ritzalam/remove-vouce-user-on-refresh 
Remove voice user on refresh
 2017-07-31 17:52:25 -04:00
Richard Alam
bd0ae4f969 Fix #4159 
- When a user is in the voice conference using webrtc and the browser refreshes, FS doesn't detect that the
   webrtc connection has gone down so it is not able to send a user left voice conf message. It would take a
   media timeout for FS to send a user left voice conf event. Remove the user from voice list when user leaves
   the meeting. Not sure how this behaves on auto-reconnect of bbb-apps while the webrtc connection is actually
   still working.
 2017-07-31 14:47:39 -07:00
Anton Georgiev
2fd4bc4330 handle PresentationConversionCompletedEvtMsg 2017-07-31 17:08:09 -04:00
Richard Alam
70cc80458c Merge pull request #4171 from ritzalam/log-logout-reason 
Log logout reason
 2017-07-31 16:56:40 -04:00
Richard Alam
8345a97960 - log more messages 2017-07-31 13:55:48 -07:00
Richard Alam
991d704d43 - fix wrong reason when meeting ends due to duration 2017-07-31 13:55:11 -07:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Klaus
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -03:00
Klaus
d06c49a6b8 Move from voice-user to voice-users 2017-07-31 16:36:41 -03:00
Richard Alam
3687247f70 Merge pull request #4170 from ritzalam/log-logout-reason 
- log logout reason
 2017-07-31 15:30:15 -04:00
Anton Georgiev
7d50c01a4a Merge pull request #4126 from Klauswk/html5-2x-handle-meeting-end 
[HTML5 2.0] Handling meeting end
 2017-07-31 15:29:15 -04:00
Richard Alam
63ed10e3f1 - log logout reason 2017-07-31 12:28:55 -07:00
Anton Georgiev
1b2591653b Merge pull request #4168 from oswaldoacauan/user-join-req-msg 
[HTML5] Implements the new join flow
 2017-07-31 15:25:24 -04:00
Oswaldo Acauan
75d67cec33 Update Meteor to 1.5.1 2017-07-31 16:19:13 -03:00
Oswaldo Acauan
f217304e19 Add publish to UserJoinMetting to the auth flow 2017-07-31 15:48:56 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager 
[HTML5] Implemented AudioManager
 2017-07-31 14:29:42 -04:00
Richard Alam
510d7717ab Merge pull request #4167 from ritzalam/fix-user-leaving 
tracking user disconnects
 2017-07-31 13:58:18 -04:00
Richard Alam
747c197239 - add analytics actor for logging messages we are interested in. Better to do this in another app 
but don't want to create another app for now. Might extract this sometime in the future.
 2017-07-31 10:54:05 -07:00
Chad Pilkey
56b362e3c7 Merge pull request #4165 from capilkey/2.0-message-recording 
Replace old Java event recording with Scala equivalent
 2017-07-31 13:24:18 -04:00
Anton Georgiev
f6699b10f7 Merge pull request #4166 from antobinary/request-wb-access-on-meteor-start 
Inform meteor app about current multi-user property in each meeting
 2017-07-31 13:21:51 -04:00