Commit Graph

27459 Commits

Author SHA1 Message Date
KDSBrowne
f063fedb9c auto select default.pdf if no actual current / new current active on delete 2020-07-14 13:49:00 +00:00
Pedro Beschorner Marin
49236ac3d0 Avoid wrongly naming a thumbnail as thumb-1 2020-07-13 19:58:02 -03:00
Anton Georgiev
1ea076a940
Merge pull request #10024 from antobinary/breakouts-url
Ensure getURL value for breakout before redirecting
2020-07-10 13:59:23 -04:00
Anton Georgiev
0b5d5fcc0f
Merge pull request #10032 from antobinary/locales-2020-07-10
Adjust check for User.loggedOut to prevent errors
2020-07-10 13:49:57 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
f6acb2cb60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into locales-2020-07-10 2020-07-10 13:23:48 -04:00
Anton Georgiev
58efe0413f
Bump up release version to 2.2.20 2020-07-10 12:57:12 -04:00
Anton Georgiev
de14c705f4
Merge pull request #10027 from wolbernd/develop
Make List of waiting users scrollable
2020-07-10 11:31:54 -04:00
Anton Georgiev
ebb80f3285
Merge pull request #9792 from symptog/v2.2.x-release
Fix missing leading zeros in conference number for 2.2.x
2020-07-10 11:31:32 -04:00
Anton Georgiev
b20043a363
Merge pull request #9728 from jfsiebel/custom-parameters-breakout-rooms
Use main room user parameters in breakouts room
2020-07-10 11:28:04 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
Anton Georgiev
5159607f73
Merge pull request #10030 from antobinary/locales-2020-07-10
Pulled HTML5 locales July 10, 2020
2020-07-10 11:21:14 -04:00
Anton Georgiev
0adaff23b4 Pulled HTML5 locales July 10, 2020 2020-07-10 11:19:42 -04:00
wolbernd
57eeb43a3b
Make List of waiting users scrollable 2020-07-10 10:08:09 +02:00
Anton Georgiev
bc55bc0d41 ensure getURL value for breakout before redirecting 2020-07-09 16:53:42 -04:00
Anton Georgiev
fad56de143
Merge pull request #9966 from lfzawacki/v2.2.x-release
Implement a simple Panopto external video player
2020-07-09 16:26:25 -04:00
Anton Georgiev
9c7b86391e
Merge pull request #10021 from prlanzarin/upstream-2.2-conf-mtm
Make some media connection timeouts configurable
2020-07-09 16:18:49 -04:00
Anton Georgiev
4e59f1e881
Merge pull request #10023 from vitormateusalmeida/issue-9970
Drop webcam when join a breakout room by clicking 'Join room'
2020-07-09 16:14:58 -04:00
Vitor Mateus De Almeida
7f7e96ee79 Drop webcam when join a breakout room by clicking 'Join room' 2020-07-09 16:49:42 -03:00
prlanzarin
1dbafffa26 audio: make listen only call timeout configurable 2020-07-09 18:02:18 +00:00
prlanzarin
0f8b27d2d8 video-provider: make camera timeouts configurable
Also add missing settings.yml val for wsConnectionTimeout
2020-07-09 17:53:24 +00:00
prlanzarin
72a67bdd63 video-provider: make reconn websocket connectionTimeout configurable
Keep the default value (current) in settings.yml
2020-07-09 17:50:04 +00:00
Anton Georgiev
0e2fc99429
Merge pull request #10003 from antobinary/enable-multi-webcams-by-default
Enable multiple webcams and network stats by default
2020-07-07 15:11:23 -04:00
Anton Georgiev
c5e6de2296 Enable multiple webcams and network stats by default 2020-07-07 18:43:46 +00:00
Anton Georgiev
e4e4446633
Merge pull request #9999 from antobinary/merge-2.2-into-2.3-july-6
Merge 2.2.19 into 2.3
2020-07-07 11:22:19 -04:00
Anton Georgiev
b0e1dc8378 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:35:34 +00:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Vitor Mateus De Almeida
06329e9442 Fix lodash import 2020-07-06 16:11:37 -03:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
fdcfd39f04 Merge remote-tracking branch 'upstream/master' into layout 2020-07-06 12:44:47 -03:00
Anton Georgiev
4321b4c967
Merge pull request #9971 from pedrobmarin/skip-norecord
Skip recording process step for norecord meetings
2020-07-06 11:17:13 -04:00
Vitor Mateus De Almeida
9a08349b36 Fix webcams bug in screenshare 2020-07-06 11:35:11 -03:00
Vitor Mateus De Almeida
cd289a47c3 Fix visual bug 2020-07-06 09:58:50 -03:00
KDSBrowne
bd0bec8c0b only show raise hand setting / toast for moderators 2020-07-06 12:56:19 +00:00
Fred Dixon
7d42aa0ea6
Merge pull request #9578 from znerol-forks/feature/develop/config-support-default-server-name
bbb-conf: respect underscore in nginx server_name
2020-07-05 16:02:52 -04:00
Fred Dixon
a6eda3da91
Merge pull request #9924 from prlanzarin/upstream-2.2-webhooks-timeout
bbb-webhooks: add a timeout configuration to be used on POST requests
2020-07-05 16:01:19 -04:00
Fred Dixon
1da679a9ad
Merge pull request #9923 from kepstin/rec-fixes
Recording bugfixes for presentation format
2020-07-05 16:00:42 -04:00
Vitor Mateus De Almeida
1f0aaa71bb Fix negative value error when chnge placement 2020-07-03 15:49:28 -03:00
Fred Dixon
2d88c8d517
Merge pull request #9685 from KDSBrowne/dev2.3-minimize-presentation
Make presentation area not visible when minimized
2020-07-03 13:50:55 -04:00
Fred Dixon
22f88bf8d0
Merge pull request #9977 from tdjac0bs/bbb_libreoffice_container
Detach libreoffice from bbb-web ( running as a docker container )
2020-07-02 16:07:58 -04:00
Tiago Jacobs
9c6daad83c Improve uninstall scripts 2020-07-02 16:20:36 -03:00
Tiago Jacobs
daea7328ad Add scripts for install/uninstall ( and service scripts ) 2020-07-02 16:01:37 -03:00
Vitor Mateus De Almeida
8cf7dee86c Fix visual bug when change webcams placement 2020-07-02 10:28:36 -03:00
Vitor Mateus De Almeida
b1fd56ebfa Fix wrong width for camera/screenshare 2020-07-02 08:19:30 -03:00
Pedro Beschorner Marin
44fc68c07c Skip recording process step for norecord meetings 2020-07-01 12:33:41 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
296092739c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-minimize-presentation 2020-06-30 20:54:59 +00:00
Lucas Zawacki
65892677ee Make file video player work on every browser 2020-06-30 17:41:44 -03:00
Lucas Zawacki
4158372ac7 Use panoto mp4 url to implement a version of external-video 2020-06-30 17:41:42 -03:00
Anton Georgiev
ec94b0f781
Merge pull request #8888 from pedrobmarin/fix-mod-webcams
Fix webcamsOnlyForModerator
2020-06-30 16:19:15 -04:00