BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,887 Commits 13 Branches 260 Tags 1.1 GiB
3e7cc432d8
Commit Graph

25887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
3e7cc432d8
Merge pull request #8298 from antobinary/locales-2 
Pulled html5 locales Nov 5, added Romanian
 2019-11-05 13:15:49 -05:00
Anton Georgiev
ecb89b0d92 Pulled html5 locales Nov 5, added Romanian 2019-11-05 13:05:41 -05:00
Anton Georgiev
f6c208f221
Merge pull request #8296 from bigbluebutton/ritzalam-fix-issue-8272 
Change message when uploaded file is too large
 2019-11-05 10:47:19 -05:00
Richard Alam
c42af014cc
Change message when uploaded file is too large 
Tell user to split file when uploaded file is too big (size) or too many pages.

Fixes issue https://github.com/bigbluebutton/bigbluebutton/issues/8272
 2019-11-05 10:09:06 -05:00
Anton Georgiev
8e8e7898ab
Merge pull request #8286 from bigbluebutton/revert-7859-issue-7855 
Revert "Webcams area resizable"
 2019-11-01 14:33:25 -04:00
Anton Georgiev
8da73912f5
Revert "Webcams area resizable" 2019-11-01 14:24:18 -04:00
Anton Georgiev
819486ff5e
Merge pull request #7859 from vitormateusalmeida/issue-7855 
Webcams area resizable
 2019-11-01 09:56:24 -04:00
Vitor Mateus de Almeida
02732a8dbe Merge remote-tracking branch 'upstream/master' into issue-7855 2019-10-31 18:17:30 -03:00
Vitor Mateus de Almeida
5686bb223a Fix webcam size when minimize presentation 2019-10-31 18:11:26 -03:00
Fred Dixon
1ddd9a64b0
Merge pull request #8283 from riadvice/update-webhooks-salt 
Set IP and shared secret for bbb-webhooks based on the right files.
 2019-10-31 13:53:49 -04:00
Fred Dixon
eecc4df0e9
Merge pull request #8282 from riadvice/fix-bbb-conf-setip 
Force root user check when assigning a new IP.
 2019-10-31 13:53:30 -04:00
Ghazi Triki
a15402ffe3 Set IP and shared secret for bbb-webhooks based on the right files. 2019-10-31 17:14:24 +01:00
Ghazi Triki
e8cbf5a3cf Force root user check when assigning a new IP. 2019-10-31 16:47:07 +01:00
Richard Alam
4c6bdebd00
Merge pull request #8225 from riadvice/big-pdf-conversion 
Detect big PDF files and check the page size
 2019-10-29 16:47:26 -04:00
Fred Dixon
ffb3689e85
Merge pull request #8268 from kepstin/playback-screenshare-mp4 
Update the configuration examples for screenshare recording processing
 2019-10-28 16:10:31 -04:00
Calvin Walton
83ba78683b Update the configuration examples for screenshare recording processing 
Add an example to enable generating an mp4 file (Apple device compatibility)
Switch the webm generation to use the faster single-pass encode by default,
since 2-pass is much slower and more cpu intensive.
 2019-10-28 14:46:10 -04:00
Richard Alam
e2417c06dc
Merge pull request #8267 from ritzalam/fix-bbb-apps-compile-issue 
red5 bbb apps compile issue
 2019-10-28 13:40:06 -04:00
Richard Alam
a86e7212b3 red5 bbb apps compile issue 
- fix compile issue on bbb-apps-common as a result of adding a timestamp field on the header.
 2019-10-28 10:22:58 -07:00
Anton Georgiev
832f8ad37e
Merge pull request #8266 from bigbluebutton/2.2-relay-false 
Default config relayOnlyOnReconnect set to false (follow-up to #8258)
 2019-10-28 11:34:22 -04:00
Paulo Lanzarin
0fd2c106d9
Default config relayOnlyOnReconnect set to false 2019-10-28 11:10:49 -04:00
Fred Dixon
f9d31794b4
Merge pull request #8227 from KDSBrowne/update-active-poll-instructions 
Update active poll panel description message string
 2019-10-28 10:02:08 -04:00
KDSBrowne
628b217efc change double quote to single 2019-10-28 13:54:04 +00:00
Fred Dixon
8e38e1d344
Merge pull request #8263 from KDSBrowne/fix-negative-lookahead 
Replace negative lookahead used in Regex
 2019-10-27 10:26:49 -04:00
KDSBrowne
655af26b32 replace negative lookahead (not supported by firefox) 2019-10-27 14:18:16 +00:00
Fred Dixon
4abbc27776
Merge pull request #8262 from KDSBrowne/issue-8197 
Fix quick poll detecting wrong options
 2019-10-26 15:03:38 -04:00
Fred Dixon
04bfc0095a
Merge pull request #8260 from KDSBrowne/issue-8257 
Fix quick poll / cc button rendering vertically
 2019-10-26 15:02:39 -04:00
KDSBrowne
84d109fe2e improve yes / no and true / false detection 2019-10-26 13:38:04 +00:00
KDSBrowne
7339686b69 fix quickpoll showing invalid option 2019-10-26 13:37:24 +00:00
KDSBrowne
919a84d1d6 fix quick poll btn placement 2019-10-26 13:19:13 +00:00
Fred Dixon
9b56f97a8b
Merge pull request #8258 from capilkey/relay-only-reconnect 
Add option to reconnect audio with relay only
 2019-10-26 08:31:54 -04:00
Chad Pilkey
927cbf35bb add option to reconnect audio with relay only 2019-10-26 02:57:49 +00:00
Richard Alam
24adb09712
Merge pull request #8255 from ritzalam/voice-conf-user-status-audit 
Voice conf user status audit
 2019-10-25 16:10:24 -04:00
Richard Alam
6f29c5307f - set different interval in sending recording and user status audio to freeswitch 2019-10-25 11:26:27 -07:00
Chad Pilkey
46bef24b1e
Merge pull request #8251 from capilkey/throttle-pen-and-cursor 
Throttle the pencil updates and increase cursor throttle
 2019-10-24 18:30:51 -04:00
Richard Alam
4f62e0ea79 - update last status in one spot 2019-10-24 15:28:16 -07:00
Chad Pilkey
37b5286d3b throttle the pencil updates and increase cursor throttle 2019-10-24 15:25:50 -07:00
Richard Alam
5d52c15456 - handle voice user status event from FreeSWITCH 2019-10-24 13:36:28 -07:00
Chad Pilkey
fe654539a0
Merge pull request #8226 from KDSBrowne/issue-8214 
Exit main audio when moderator joins breakoutroom via panel
 2019-10-24 14:36:54 -04:00
Fred Dixon
a1b9a32a69
Merge pull request #8248 from ffdixon/bump-23 
Bump 23
 2019-10-24 14:25:49 -04:00
Fred Dixon
08ee7f1d55 Bump to version 23 2019-10-24 13:24:24 -05:00
Fred Dixon
5695011997 Fix description at top of breakout dialog 2019-10-24 13:24:15 -05:00
Chad Pilkey
5f356338c8
Merge pull request #8241 from capilkey/adj-extvideo-sync-interval 
Adjust external video sync interval and emit check
 2019-10-24 13:43:28 -04:00
Anton Georgiev
3d3e5d0c17
Merge pull request #8245 from capilkey/fix-breakout-joinURL 
Only request a breakout join URL once
 2019-10-24 13:11:04 -04:00
Chad Pilkey
297c06e507 only request a join URL once 2019-10-24 10:01:39 -07:00
Chad Pilkey
6cccfb2ada
Merge pull request #8168 from KDSBrowne/issue-8112 
Extend help text shown when getUserMedia with microphone fails
 2019-10-24 12:28:53 -04:00
Chad Pilkey
51b70a1361 only attempt to stop ext video if it's sharing 2019-10-23 14:20:57 -07:00
Richard Alam
7752808f47 - keep track of last user status update 2019-10-23 14:19:51 -07:00
Chad Pilkey
7174050fb3 adjust external video sync interval and emit check 2019-10-23 13:29:06 -07:00
Chad Pilkey
5966923ae9
Merge pull request #8232 from lfzawacki/detect-autoplay-problems-external-video 
Fix multiple external videos synced to different meetings
 2019-10-23 16:18:23 -04:00
Lucas Zawacki
a17b28b23f Fix variable definition in initializeExternalVideo 2019-10-23 16:24:34 -03:00