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

17368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
c0b940b063 Merge pull request #4173 from antobinary/fix-presentation 
[HTML5 2.0] Handle PresentationConversionCompletedEvtMsg
 2017-08-01 09:20:35 -04: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
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
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
Ghazi Triki
f67304442a Improve audio and lock settings title windows. 2017-07-31 18:13:10 +01:00
Ghazi Triki
77c5b98e2a Minor fixes to TabIndexer class. 2017-07-31 18:11:51 +01:00
Anton Georgiev
39565e5a72 switch to a new sync message on html5 only redis channel 2017-07-31 12:12:16 -04:00
Chad Pilkey
f69a70bb3b remove old java record classes in akka-apps 2017-07-31 12:07:06 -04:00
Chad Pilkey
1f8aa4618f new akka-apps record structure 2017-07-31 12:02:13 -04:00
Richard Alam
3a6225da2a - reset timestamp of when last user left when a user joins the meeting 2017-07-31 08:55:58 -07:00
Richard Alam
90a98267ed - change message when user logs out and ends the meeting 2017-07-31 08:54:33 -07:00
Richard Alam
b887a65fe9 Merge branch 'pedrobmarin-sharednotes-limit' into bbb-2x-mconf 2017-07-31 08:51:31 -07:00
Richard Alam
4c92969a45 Merge branch 'sharednotes-limit' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-sharednotes-limit 2017-07-31 08:44:14 -07:00
Richard Alam
7577e5c8ee Merge branch 'antobinary-handle-presenter-gone' into bbb-2x-mconf 2017-07-31 08:42:26 -07:00
Richard Alam
2d2261f36a Merge branch 'handle-presenter-gone' of https://github.com/antobinary/bigbluebutton into antobinary-handle-presenter-gone 2017-07-31 08:32:42 -07:00
Ghazi Triki
39fdeabf4c Improved audio settings windows. 2017-07-31 14:53:04 +01:00
Pedro Beschorner Marin
c919a203e7 Removed extra line included by mistake 2017-07-30 22:37:55 +00:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00:00
Anton Georgiev
88055c5ca9 add sync of whiteboard access on meteor start 2017-07-28 17:57:41 -04:00
Anton Georgiev
173ba4531a stop screenshare and poll on presenter leave 2017-07-28 17:16:03 -04:00
Richard Alam
ccb5b8b5cc Merge branch 'ritzalam-do-not-send-extra-msg-on-val-token' into bbb-2x-mconf 2017-07-27 14:00:40 -07:00
Richard Alam
87e035c7a5 Merge branch 'do-not-send-extra-msg-on-val-token' of https://github.com/ritzalam/bigbluebutton into ritzalam-do-not-send-extra-msg-on-val-token 2017-07-27 13:52:33 -07:00
Richard Alam
ddef378e6a Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-27 13:51:40 -07:00
Richard Alam
c2cf511956 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-27 13:47:13 -07:00
Richard Alam
eb994c09a3 - do not send extra messages on validate token response 
- make flash client explicitly send user join message to server
 2017-07-27 13:42:36 -07:00
Ghazi Triki
b6f11c5604 Updated list text states colours and bottom bar items height. 2017-07-27 21:36:23 +01:00
Anton Georgiev
b78f40b543 Merge pull request #4119 from JaeeunCho/new_icon 
[HTML5 2.0] added new icons
 2017-07-27 15:49:33 -04:00