Anton Georgiev
|
a49485dba7
|
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into develop
|
2020-07-15 20:12:43 +00:00 |
|
Anton Georgiev
|
819a4ea8fb
|
Merge pull request #10077 from bigbluebutton/revert-9498-issue-8744
Revert "Replace unsafe react lifecycle methods"
|
2020-07-15 15:53:36 -04:00 |
|
Anton Georgiev
|
21b6def708
|
Revert "Replace unsafe react lifecycle methods"
|
2020-07-15 15:52:34 -04:00 |
|
Anton Georgiev
|
f7ca8423c0
|
Merge pull request #10075 from bigbluebutton/revert-8729-layout
Revert "Create layout context and add a layout manager"
|
2020-07-15 12:47:45 -04:00 |
|
Anton Georgiev
|
7535e6fa59
|
Revert "Create layout context and add a layout manager"
|
2020-07-15 12:44:59 -04:00 |
|
Anton Georgiev
|
b747f84f44
|
Merge branch 'update-meteor-1101' of github.com:Tainan404/bigbluebutton into develop
|
2020-07-14 16:16:35 +00:00 |
|
Anton Georgiev
|
b8611f6c1f
|
Merge pull request #9958 from daminebenq/fix-breakout-autotest
Fix breakout autotest
|
2020-07-14 11:20:31 -04:00 |
|
Anton Georgiev
|
7d75843140
|
Fix a forgotten line left while resolving conflict
|
2020-07-14 11:19:11 -04:00 |
|
Anton Georgiev
|
6fba72f282
|
Merge pull request #10061 from KDSBrowne/issue-9986
Auto select default.pdf after deleting the current presentation
|
2020-07-14 10:36:44 -04:00 |
|
Anton Georgiev
|
4e06ec51c1
|
Merge pull request #8729 from vitormateusalmeida/layout
Create layout context and add a layout manager
|
2020-07-14 10:34:11 -04:00 |
|
Anton Georgiev
|
b9b4490d8c
|
Merge branch 'develop' into layout
|
2020-07-14 10:32:24 -04:00 |
|
Anton Georgiev
|
e48306431a
|
Merge pull request #9498 from Tainan404/issue-8744
Replace unsafe react lifecycle methods
|
2020-07-14 10:30:37 -04:00 |
|
KDSBrowne
|
f063fedb9c
|
auto select default.pdf if no actual current / new current active on delete
|
2020-07-14 13:49:00 +00: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 |
|
wolbernd
|
57eeb43a3b
|
Make List of waiting users scrollable
|
2020-07-10 10:08:09 +02: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 |
|
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 |
|
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 |
|
Anton Georgiev
|
ec94b0f781
|
Merge pull request #8888 from pedrobmarin/fix-mod-webcams
Fix webcamsOnlyForModerator
|
2020-06-30 16:19:15 -04:00 |
|
Anton Georgiev
|
a2142c9006
|
Merge pull request #9963 from antobinary/add-url-to-logs
Added clientURL to client logs
|
2020-06-30 15:59:39 -04:00 |
|
Anton Georgiev
|
0a399af81f
|
add clientURL to logs from client
|
2020-06-30 15:18:01 -04:00 |
|
Fred Dixon
|
175a23e5ad
|
Merge pull request #9962 from ffdixon/update-bbb-conf-1
Ensure ESL password is updated
|
2020-06-30 13:19:21 -04:00 |
|
Fred Dixon
|
db9ed99ea7
|
Ensure ESL password is updated
|
2020-06-30 12:17:12 -05:00 |
|
Anton Georgiev
|
f54e9ffe37
|
Merge pull request #9929 from daminebenq/audio-and-webcam-autotests-fix
fixes webcam and audio automated tests
|
2020-06-30 08:33:13 -04:00 |
|
Mohamed Amine Ben Salah
|
63705729a5
|
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into fix-breakout-autotest
|
2020-06-29 22:25:20 -03:00 |
|
Mohamed Amine Ben Salah
|
85f6ef3dda
|
fixes breakout automated test and makes it stable
|
2020-06-29 22:25:04 -03:00 |
|
Anton Georgiev
|
0f54dfdcb8
|
Merge pull request #9949 from antobinary/decouple-mute-unmute
Prevent 'unmute' calls for others caused by incorrect state
|
2020-06-26 16:07:35 -04:00 |
|