Commit Graph

25866 Commits

Author SHA1 Message Date
Richard Alam
9dd44ad84b - filter our global audio users 2019-10-21 15:08:51 -07:00
Richard Alam
b0276e5725 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into voice-conf-user-status-audit 2019-10-21 14:32:19 -07:00
Richard Alam
0261a5e2b8 - send users and recordings in one message 2019-10-21 14:29:52 -07:00
Chad Pilkey
9b0b92b6a2
Merge pull request #8174 from KDSBrowne/issue-8160
Fix actions button misplacement in RTL mode
2019-10-21 17:05:47 -04:00
Pedro Beschorner Marin
4bc6fae649 Patching playback updates for iOS (#8195) 2019-10-21 16:05:59 -04:00
Richard Alam
1e7557562f Sync FS user status
- poll FreeSWITCH for status of user so that akka-apps would be in sync with FreeSWITCH
2019-10-21 11:01:58 -07:00
Richard Alam
9582aaecfa
Merge pull request #8220 from ritzalam/add-timestamp-on-msg-header
Add timestamp on msg envelope
2019-10-21 11:34:21 -04:00
Richard Alam
ade85da737
Merge pull request #8223 from ritzalam/upgrade-vertx-akka
Prototyping client <-> server messaging
2019-10-20 13:42:05 -04:00
Richard Alam
48e92f7f08 Prototyping client <-> server messaging
This is a prototype of sending messages between client and server outside of meteor.
2019-10-20 10:34:22 -07:00
Fred Dixon
e56f0c2a4f
Merge pull request #8219 from kepstin/deskshare-autoplay
Make presentation playback continue if deskshare.xml was not found
2019-10-18 14:40:10 -04:00
Richard Alam
62e5e599d3 - add timestamp field to messages sent from html5 server 2019-10-18 09:50:38 -07:00
Calvin Walton
69aa493d90 Make presentation playback continue if deskshare.xml was not found
Someone on the mailing list had some recordings which were using the 2.0
playback, but were missing the deskshare.xml file (which should always
be present for 2.0… strange). It's safe to continue loading the recording
playback if the deskshare.xml file is not found, the recording will just act
as if there were no deskshare start/stop events.
2019-10-18 12:42:29 -04:00
Richard Alam
63525b425e Add timestamp on message
- add a new timestamp field on the message envelope so we can collect
   statistics on message processing times.
2019-10-18 08:41:27 -07:00
Richard Alam
cbecf32050
Merge pull request #8215 from ritzalam/poll-audio-recording
Make sure we record audio if meeting is recorded
2019-10-17 16:44:23 -04:00
KDSBrowne
6b556c6d1b make audio exit when moderator joins breakoutroom via panel btn 2019-10-17 20:42:14 +00:00
Richard Alam
3395cdbdc0 Make sure we record audio if meeting is recorded
- We had an issue where FreeSWITCH, for some unknow reason, stopped recording the voice conference
   in the middle of the meeting while there are users in the voice conference. We've relied on the
   voice conf started event to trigger recording of wav files. This event is sent when the first user
   joins the voice conference. In this case, there was no voice user joined after the recording stopped
   as there were already users in the voice conference. TO make sure that the audio is recorded, akka-apps
   will send a "check if voice conf is running and recording" message to FreeSWITCH every 30sec. If akka-apps
   receives a "running=true recording=false" response from FreeSWITCH, akka-apps will send a start recording
   msg to FreeSWITCH.
2019-10-17 11:50:12 -07:00
Lucas Zawacki
25b4c93283 Better style for autoplay blocked message that does not obscure play button 2019-10-16 14:48:12 -03:00
Lucas Zawacki
ceb8853231 Prevent problems if presenter reconnects while sharing a video 2019-10-16 14:48:09 -03:00
Lucas Zawacki
926d4bb36e Destructure assignments and fix wrong assignment for isPresenter 2019-10-16 14:47:22 -03:00
Fred Dixon
bcbb52701b
Merge pull request #8212 from ffdixon/minor-bbb-conf
Check that the tomcat7 log directory first exists
2019-10-14 18:58:29 -05:00
Fred Dixon
a53cf2016f Check that the tomcat7 log directory first exists 2019-10-14 18:57:38 -05:00
Fred Dixon
dc4bf4c5da
Merge pull request #8208 from ffdixon/bump-22
Updated bbb-conf for bbb-webhooks
2019-10-13 13:14:12 -04:00
Fred Dixon
6b8d1a4c15 Updated bbb-conf for bbb-webhooks 2019-10-13 12:11:16 -05:00
Fred Dixon
2249d3c48b
Merge pull request #8207 from tdjac0bs/npm-mongofastdb
Add script to start meteor using external mongo (from packaging)
2019-10-12 18:58:45 -04:00
Tiago Daniel Jacobs
d49578342d Add script to start meteor using external mongo (from packaging) instead of embeded mongo 2019-10-12 19:51:20 -03:00
Lucas Zawacki
24198c48a6 Prevent erroneous autoplay warning if video player sends multiple ready messages 2019-10-10 19:09:39 -03:00
Lucas Zawacki
30b303a6d4 Making sure we show controls for all video formats because viewer always need to change volume 2019-10-10 19:09:39 -03:00
Lucas Zawacki
dcd0ea7d5d Fix style of external video modal after adding new note 2019-10-10 19:09:31 -03:00
Lucas Zawacki
22be388b70 Remove unused intl variable from external-video 2019-10-10 18:01:27 -03:00
Richard Alam
c20233bcce
Merge pull request #8205 from ritzalam/send-uuid_kill-message-to-fs
Eject users by force from FreeSWITCH
2019-10-10 14:41:24 -04:00
Richard Alam
aa22c629cb Eject users by force from FreeSWITCH
- when meeting ends, we try to eject all users by force from freeswitch to make sure
   that recording ends. However, we are not actually sending the command to freeswitch.
   This change sends the command so that users can be kicked out.
2019-10-10 11:38:27 -07:00
Richard Alam
5be228e948
Merge pull request #8204 from ritzalam/have-only-one-esl-listener
Have only one ESL listener
2019-10-10 13:00:23 -04:00
Richard Alam
0a6701ff5b Have only one ESL listener
- on auto-reconnect when FS restarts, the auto-reconnect add another
   listener to the ESL client resulting in multiple handlers of ESL events
   and multiple messages to akka-apps. This resulted in multiple recordings
   of audio when the first user joins as akka-apps receives 2 user join events.
2019-10-10 09:50:25 -07:00
Richard Alam
dd6d58b36a Update issue templates
Trying out issue template.
2019-10-09 15:10:55 -04:00
Chad Pilkey
7bc9b6f669
Merge pull request #8202 from KDSBrowne/update-translations-2019-10-09
Update locale translations
2019-10-09 14:40:50 -04:00
KDSBrowne
13fdbfef43 Pull translations from transifex 2019-10-09 2019-10-09 18:21:58 +00:00
Fred Dixon
f9b697fb7f
Merge pull request #8201 from kepstin/deskshare-autoplay
presentation playback: Make setMediaSync a no-op if there's no deskshare
2019-10-09 12:40:22 -04:00
Calvin Walton
726406f0f5 presentation playback: Make setMediaSync a no-op if there's no deskshare
Previously the setMediaSync function was only called after the deskshare
loaded, but by moving it to run after all media loaded, it now runs even
on recordings that didn't have deskshare. Make it do nothing (return early)
in that case.
2019-10-09 12:32:57 -04:00
Lucas Zawacki
0b99a4cf63 Add supported video urls in external video modal note 2019-10-09 12:51:17 -03:00
Lucas Zawacki
1fb6922712 Properly show/hide controls for more kinds of external video players 2019-10-09 11:54:54 -03:00
Chad Pilkey
4aefc00be5
Merge pull request #8199 from capilkey/video-preview-css-imp
Limit width of the webcam preview video
2019-10-08 17:19:21 -04:00
Chad Pilkey
782b705f66 limit width of the webcam preview video 2019-10-08 14:16:16 -07:00
Chad Pilkey
dba2974e89
Merge pull request #8196 from capilkey/actually-disable-headdump
Fix check for heapdump enabled
2019-10-08 13:45:24 -04:00
Chad Pilkey
42bad2142e fix check for heapdump enabled 2019-10-08 10:40:53 -07:00
Fred Dixon
6c0e1ce07d
Merge pull request #8193 from kepstin/deskshare-autoplay
Fix deskshare media sync when deskshare loads before webcam/audio
2019-10-07 15:57:09 -04:00
Calvin Walton
d5097fa43e Fix deskshare media sync when deskshare loads before webcam/audio
If the secondary media loaded before the main media, it would run the
"setMediaSync" function before the main media player was setup. As a
side-effect of setting up the main media player, all of the event handlers
added by the setMediaSync function are detached, and so the secondary
media never starts playing.

Move the call to setMediaSync to after the media-ready events for all
media have fired, so that it can reliably attach the event handlers.
2019-10-07 15:21:40 -04:00
Lucas Zawacki
ec88bd24e4 Prevent viewers from playing before video has loaded for presenter 2019-10-07 15:42:37 -03:00
Lucas Zawacki
290cd481e5 Don't run synchronization code on a player with autoplay blocked and add an autoplay warning 2019-10-07 14:45:16 -03:00
Fred Dixon
12b3384783
Merge pull request #8189 from ffdixon/add-unlocked
Add label to unlocked state
2019-10-06 08:41:40 -04:00
Fred Dixon
cde05639c0 Add label to unlocked state 2019-10-06 07:40:58 -05:00