BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,065 Commits 13 Branches 260 Tags 1.1 GiB
2b18bb3b75
Commit Graph

724 Commits

Author SHA1 Message Date
Richard Alam
73493f1345 - change how we handle listen only for html5 user 2017-10-12 15:33:22 -07:00
Richard Alam
680a538596 - do not set listenOnly status when receiving user joined voice event from FS as 
HTML5 client connects with no mic
 2017-10-12 14:41:12 -07:00
Richard Alam
8ae38b6f5a - format 2017-10-02 18:01:33 -07:00
Ghazi Triki
ab93ae6c22 Fix send breakout room join url for late joiners. 2017-10-02 18:56:36 +01:00
Richard Alam
987e58e78c - fix issue where audio isn't recording if there is already a user joined listen only before a user 
joins full duplex.
 2017-09-07 09:11:11 -07:00
Anton Georgiev
f6edf5d6fb eject phone user from voice instead of kicking it 2017-09-06 17:55:44 -04:00
Chad Pilkey
523bfa0338 Merge pull request #4334 from ritzalam/rec-poll-result 
- fix recording of poll result. See issue #4237.
 2017-09-05 14:18:08 -04:00
Pedro Beschorner Marin
4017d12fa1 Refactored shared notes cleaning to force sync 2017-09-01 19:36:15 +00:00
Chad Pilkey
a8ff311f91 Merge pull request #4342 from pedrobmarin/shared-notes-message-limit 
Shared notes message limit
 2017-08-30 18:42:00 -04:00
Chad Pilkey
52bff50f10 clean dimension numbers from pencil end message 2017-08-30 17:14:00 -04:00
Pedro Beschorner Marin
6ab641e7c3 Added shared notes clear button for moderators 2017-08-30 20:32:42 +00:00
Richard Alam
82177b4d85 - fix recording of poll result. See issue #4237. 2017-08-30 11:01:19 -07:00
Chad Pilkey
b0e3442ef6 relax the pencil smoothing a little 2017-08-29 10:23:25 -04:00
Chad Pilkey
97da17d13b send annotation updates based on timer 2017-08-23 17:55:03 -04:00
Chad Pilkey
c4f1e7b06f Merge pull request #4269 from capilkey/remove-userid-capilization 
Remove userId capital in  AssignPresenter recorded event
 2017-08-18 14:09:53 -04:00
Chad Pilkey
50d617f622 remove userId capital in AssignPresenter recorded event 2017-08-18 14:07:38 -04:00
Richard Alam
6c1945551d - fix rtt timer 2017-08-17 14:24:23 -07:00
Anton Georgiev
7cddb1b865 Merge pull request #4258 from antobinary/webcams 
Do not send broadcast cam event for existing stream
 2017-08-17 12:21:11 -04:00
Richard Alam
458d23d0a2 - fix mute all and mute except presenter issue where all users cannot be muted then unmuted 2017-08-16 14:30:36 -07:00
Richard Alam
5e1297e8f8 - trigger sending of rtt from server side 
- send rtt of client to server so we can collect data
 2017-08-16 14:05:22 -07:00
Anton Georgiev
192cd48810 do not send broadcast cam event for existing stream 2017-08-16 16:16:22 -04:00
Richard Alam
ec314b8105 - add round trip trace message from client and back to tell us where the bottleneck 
might be when using multi-user whiteboard.
 2017-08-16 09:44:27 -07:00
Richard Alam
13b6dc065e - fix issue where we cannot start breakout rooms again when the first breakout session ends. 2017-08-15 12:24:21 -07:00
Richard Alam
3879d48f17 Merge branch 'audio-state' of https://github.com/antobinary/bigbluebutton into antobinary-audio-state 2017-08-14 11:52:04 -07:00
Anton Georgiev
293c58ca42 distinguish fresh user join from reconnect. Recover audio state 2017-08-14 14:38:51 -04:00
Chad Pilkey
ac030e6254 fix meeting and client locking 2017-08-11 20:53:09 -04:00
Richard Alam
bc6f4f6638 - log switch presentation 
- fix switch presentation
 2017-08-11 13:19:56 -07:00
Richard Alam
965977cf80 - go through all presentations instead of just getting the active presentation 2017-08-11 13:19:05 -07:00
Anton Georgiev
412c1f95a2 refactor join audio user handler so it can be reused 2017-08-11 15:56:03 -04:00
Anton Georgiev
ec3166dc4a pass correct value for voiceUserId 2017-08-11 15:51:11 -04:00
Richard Alam
7956b561d2 - remove some printlns to minimize noise 2017-08-11 11:22:26 -07:00
Richard Alam
53b64fcca0 Merge branch 'end-breakout-rooms' of https://github.com/ritzalam/bigbluebutton into ritzalam-end-breakout-rooms 2017-08-10 13:58:02 -07:00
Richard Alam
7f63490e63 - end breakout rooms when parent meeting ends 
- send breakout ended event
 - do not send negative time remaining updates
 2017-08-10 13:29:33 -07:00
Anton Georgiev
1e492dba73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state 2017-08-10 15:31:29 -04:00
Richard Alam
d50041f03c - send messages into separate channels so other components can pick and choose which 
channels to listen to.
 2017-08-10 10:14:50 -07:00
Anton Georgiev
0546afce1f only allow presenter to change slide 2017-08-10 10:59:03 -04:00
Pedro Beschorner Marin
185f6a85e9 Missing code for the promote/demote users feature 2017-08-09 20:13:52 +00:00
Richard Alam
131c67def3 Merge branch 'fix-webcam-state' of https://github.com/antobinary/bigbluebutton into antobinary-fix-webcam-state 2017-08-08 14:41:51 -07:00
Anton Georgiev
97b3c2fec9 Merge branch 'fix-webcam-state' of github.com:antobinary/bigbluebutton into fix-webcam-state 2017-08-08 15:57:43 -04:00
Anton Georgiev
6b4c9ea8a4 drop camera for leaving user 2017-08-08 15:22:21 -04:00
Richard Alam
1a698058e1 - implement check to see if akka-apps is alive from bbb-web so we can return an 
error to API requests
 2017-08-08 12:16:00 -07:00
Richard Alam
05054e4875 - need to notify parent meeting of user join and leave to get listen in to work 2017-08-04 09:32:52 -07:00
Richard Alam
f82e4f9d45 Merge pull request #4203 from ritzalam/fix-breakout-listen-mode 
breakout listen mode
 2017-08-03 23:20:13 -04:00
Richard Alam
279d3797ef - not transfer works but user isn't removed from users list in breakout room 2017-08-03 15:16:29 -07:00
Chad Pilkey
8db84cdf3f improvements to the recorded shape events 2017-08-03 15:41:40 -04:00
Richard Alam
a4243ac87a - auto-assign presenter when presenter is ejected from meeting 2017-08-03 10:50:58 -07:00
Richard Alam
dfef819823 - fix issue where if there is no presenter, we cannot assign a presenter. 2017-08-03 10:50:17 -07:00
Chad Pilkey
34fa2f22b2 Merge pull request #4195 from capilkey/record-extra-share-presentation 
Record extra SharePresentationEvent when conversion complete and current
 2017-08-02 17:30:30 -04:00
Chad Pilkey
4d16c73bde record extra SharePresentationEvent when conversion complete and current 2017-08-02 17:26:02 -04:00
Richard Alam
5ecf0c3651 - hook up end meeting from api 2017-08-02 13:06:16 -07:00
Richard Alam
b072b6e354 - log start voice recording message 2017-08-02 11:32:43 -07:00
Richard Alam
f6419cce4c - ignore messages we don't want to record 2017-08-02 11:32:22 -07:00
Richard Alam
d169c417bc - start recording voice conf when first user joins 2017-08-02 11:31:30 -07:00
Richard Alam
69268f8628 - fix exception when recording pencil whiteboard shape 2017-08-02 11:31:01 -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
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Chad Pilkey
c8caf39d50 make layout data instance based instead of static 2017-07-31 19:02:45 -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
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
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
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
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
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
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
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
Richard Alam
156436d34a - reset last user left timestamp when user joins meeting 2017-07-27 12:13:05 -07:00
Richard Alam
3fd747a9b3 - log when meeting ends 2017-07-27 11:35:26 -07:00
Richard Alam
6df8305dac - log reason when meeting expires 2017-07-27 10:18:03 -07:00
Richard Alam
d39e823a85 Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages 2017-07-27 07:53:27 -07:00
Richard Alam
6fb08c1396 - convert over lock setting into 2x messages 2017-07-26 13:19:19 -07:00
Richard Alam
36e8f02667 - fix meeting expiry 2017-07-25 15:02:07 -07:00
Richard Alam
b1ad1668dd - fix test compile errors 2017-07-25 13:44:18 -07:00
Richard Alam
3921eaf36f - display timer 
- make sure talking indicator is off when user is muted
 2017-07-25 13:43:35 -07:00
Richard Alam
d0b7e9c121 - assign presenter when presenter leaves 2017-07-25 13:41:56 -07:00
Richard Alam
59e149a6e1 - display meeting time remaining 2017-07-25 11:54:13 -07:00
Pedro Beschorner Marin
cd34d2c139 Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
 2017-07-25 14:47:21 +00:00
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00:00
Richard Alam
8415300b3f - fix breakout time remaining 2017-07-24 14:44:15 -07:00
Richard Alam
ab5cad41e7 - handle some of breakout messages 
- timer still not working
 - listen not working
 - breakout users list not working
 2017-07-24 12:56:09 -07:00
Richard Alam
555302f11e - try to fix messaging of breakout rooms 2017-07-24 10:39:29 -07:00
Richard Alam
e89c20f245 - need to fix client to handle breakout messages properly 2017-07-23 18:39:00 -07:00
Richard Alam
8305782294 - create breakout room 
- send join url to client
 2017-07-23 18:14:26 -07:00
Richard Alam
8c2eeac294 - modify how we set meeting state 
- cleanup
 2017-07-22 08:42:02 -07:00
Richard Alam
1269347289 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-21 20:55:40 -07:00
Richard Alam
10c4846b92 - provide a way to filter messages we want to record 2017-07-21 20:25:41 -07:00
Richard Alam
2abedb7276 - try to fix breakout rooms 2017-07-21 19:00:00 -07:00
Richard Alam
47f012f08f - start fixing breakout rooms 2017-07-21 14:15:51 -07:00
Chad Pilkey
d68229f182 fix the resize and move data storage 2017-07-21 15:53:43 -04:00
Chad Pilkey
c8f38ebae1 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 14:30:51 -04:00
Chad Pilkey
043c55e0bf Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 13:55:06 -04:00