Commit Graph

118 Commits

Author SHA1 Message Date
Mohamed Amine Ben Salah
06e28f37bf fixes screenshare toast - issue: #10982 2020-12-07 11:10:54 -03:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
Anton Georgiev
33a71e5f67
Merge pull request #10218 from Tainan404/unsafe-media-and-presentation-components
Remove unsafe lifecycle from all media and presentation components
2020-09-10 15:23:48 -04:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
1581c71efe Normalize custom parameters by removing extra space. 2020-09-08 11:29:05 -03:00
Anton Georgiev
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
prlanzarin
e7323ee6a5 video-provider: fix dynamic profile accounting when using pagination 2020-08-24 18:30:24 +00:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
cf1d0cedef Remove unsafe lifecycle from all madia and presentation related components 2020-08-07 17:32:46 -03:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Vitor Mateus De Almeida
4d61aefa78 Fix exception when screenshare is running 2020-07-20 16:23:02 -03:00
Vitor Mateus
ecc8f4a056 wip 2020-07-20 16:16:39 -03:00
Vitor Mateus
e2db60e662 WIP Resizable works fine 2020-07-20 16:11:09 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -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
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -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
Vitor Mateus De Almeida
ad6ee4fdb0 Fix exception when screenshare is running 2020-06-20 23:24:36 -03:00
Vitor Mateus
a1d4311cec wip 2020-06-04 20:01:17 -03:00
KDSBrowne
23e306b9e6 handle userData autoSwap and hidePresentation params 2020-06-01 13:29:43 +00:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
8fc32bc7dc update message in media container 2020-05-21 18:26:47 +00:00
Vitor Mateus
00259ab371 WIP Resizable works fine 2020-04-23 11:07:44 -03:00
Tainan Felipe
819e83e6f9 Replace legacy react lifecycle in the media component 2020-04-15 15:56:20 -03:00
Vitor Mateus
35a5b45b1c Fixes resizing bar appearing while there are no webcams shared #8531 2020-01-23 15:09:39 -03:00
Pedro Beschorner Marin
3b591a086b Unified video providers 2019-12-10 09:02:16 -03:00
Pedro Beschorner Marin
9fcae355c7 joinVideo gets the deviceId 2019-12-10 08:21:22 -03:00
Pedro Beschorner Marin
debd8f714a Removed unused session vars logic 2019-12-10 08:21:21 -03:00
Pedro Beschorner Marin
3d2dd9b11c Sharing webcam with deviceId prefix 2019-12-10 08:21:20 -03:00
Pedro Beschorner Marin
4eb67c12be Multiple webcams first commit 2019-12-10 08:21:19 -03:00
Anton Georgiev
cfb58749e4
Merge pull request #8303 from vitormateusalmeida/webcam-resizable
Webcam resizable
2019-11-08 15:28:58 -05:00
Vitor Mateus
62ea5f247c Fix webcam size when minimize presentation 2019-11-05 16:40:29 -03:00
Vitor Mateus de Almeida
3f1ff2c65c Fix webcam size when minimize presentation 2019-11-05 16:26:45 -03:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
Anton Georgiev
8da73912f5
Revert "Webcams area resizable" 2019-11-01 14:24:18 -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
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Lucas Zawacki
546f4cdac5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player 2019-08-27 15:09:40 -03:00
Chad Pilkey
6e76dd584b improve user fetch and sort, and webcam fetch 2019-08-09 15:39:55 -07:00
Vitor Mateus
e8f15b97b6 Fix fullscreen edge cases 2019-07-26 13:48:51 -03:00
Vitor Mateus
fc75100bb4 Disable draggable when webcam is fullscreen 2019-07-24 14:21:04 -03:00
Diego Benetti
4a764f8f6c Implements new name for parameters and the support to the old names 2019-07-22 11:28:13 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00