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

17593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
43e6359029 make presenter cursor colour switch correctly 2017-08-02 13:04:09 -04:00
Richard Alam
beb7155121 Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size 2017-08-02 08:22:02 -07:00
Ghazi Triki
8d0a74e904 Minor imprvements to icon sizes. 2017-08-02 16:12:52 +01:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
e0c1e295ee Merge branch 'slides-refactor-2x' of https://github.com/klauswk/bigbluebutton into slides-refactor-2x 2017-08-02 11:32:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
a0368e55cf Fix voiceUser mic states 2017-08-02 10:11:53 -03:00
Ghazi Triki
dd9b71717a Add icons to users settings menu and imporve BreakoutRoomSettings window layout. 2017-08-02 13:45:34 +01:00
Ghazi Triki
961b417e65 Improve users list icons and item renders layout. 2017-08-02 12:53:20 +01:00
Ghazi Triki
9f938d9cde Remove warning in SharedNotesEventMapDelegate.as 2017-08-02 12:51:45 +01: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
Oswaldo Acauan
35fd834397 Fix error when a user have no subName 2017-08-01 14:50:33 -03:00
Oswaldo Acauan
df35a22676 Merge branch 'bbb-2x-mconf' into userlist-2x-design 2017-08-01 14:29:12 -03: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
Pedro Beschorner Marin
ca36ec29d8 Included missing getters and setters for recordings size and raw size 2017-08-01 16:33:45 +00:00
Klaus
6cc46b8627 Add const to voiceUser 2017-08-01 13:04:20 -03:00
Pedro Beschorner Marin
73443fe2db Clean up unused redis message service 2017-08-01 15:14:03 +00:00
Pedro Beschorner Marin
835f7d5371 Removed unused playbacks included with mconf merge 2017-08-01 15:11:49 +00: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
Klauswk
7935c843b3 Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-08-01 11:07:58 -03: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