Commit Graph

107 Commits

Author SHA1 Message Date
Anton Georgiev
2dabeaae29 remove duplicated html id video-modal-input 2021-01-06 16:53:22 +00:00
hiroshisuga
3dc0aa83f2
Update component.jsx 2020-12-27 00:01:54 +09:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
Lucas Zawacki
7c704c78c1 PeerTube player, first version 2020-11-26 17:33:08 -03:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Lucas Zawacki
7efcd3b87e Dont include extra dot in instructure media url 2020-10-21 14:00:51 -03:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Lucas Zawacki
19d24cbb60 Make instructuremedia regexp more general 2020-10-09 18:09:35 -03:00
Anton Georgiev
1d86d0ea80
Merge pull request #10341 from vitormateusalmeida/issue-10339
Fix bug when alternate panel. Fix external video size
2020-09-11 09:18:10 -04:00
KDSBrowne
b33b5f3f01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-remove-css-variable-duplicates 2020-09-01 21:17:25 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00: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
Vitor Mateus De Almeida
9ed9d1fd6c Fix bug when alternate panel. Fix external video size 2020-08-27 09:44:41 -03:00
KDSBrowne
6f377c3d77 make external video MATCH_URL even more generic 2020-08-24 17:59:46 +00:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
KDSBrowne
84af0bc0cc improve panoptoMATCH_URL regex (more generic) 2020-08-05 17:08:57 +00:00
Stefan Weil
1d3d31107e Fix regular expression in Arc Player (LGTM)
LGTM report:

    The escape sequence '\.' is equivalent to just '.', so the sequence may
    still represent a meta-character when it is used in a regular expression.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-08-04 08:28:36 +02: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
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Lucas Zawacki
0e9baf8ac7 fix twitch option name 2020-06-12 15:06:58 -03:00
Lucas Zawacki
abf4f45602 Update react-player and fix twitch sharing 2020-06-12 15:01:15 -03:00
Lucas Zawacki
a5bd5d8086 Prevent playbackrate update if value hasn't changed 2020-06-09 16:55:25 -03:00
Lucas Zawacki
9b7c734f86 Prevent problems playing some vimeo videos by adding default options 2020-06-09 16:55:23 -03:00
Lucas Zawacki
71819feaab Call onmount for custom arc-player 2020-06-01 15:36:16 -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
Lucas Zawacki
b9c75b4872 Remove timestamp correction logic 2020-05-18 13:16:03 -03:00
Lucas Zawacki
aa8326995c Work with video time based in seconds (integers) 2020-05-18 12:11:12 -03:00
Lucas Zawacki
e67781d133 Centralize external video presenter message emission via a meteor call 2020-03-02 17:58:51 -03:00
Lucas Zawacki
0088c348a5 Logic to throttle pause/un-pause messages coming from presenter 2020-02-27 16:42:07 -03:00
Lucas Zawacki
2102d0e66f Better handle and explain remote/local timestamp logic 2020-02-27 15:01:04 -03:00
Lucas Zawacki
6cbb4d6592 Adjust seek messages based on local and remote timestamps 2020-02-27 13:39:19 -03:00
Lucas Zawacki
f0d588511c Check presenter status outside of streamer 2020-02-27 13:39:00 -03:00
Lucas Zawacki
c7bba345c6 Remove unused setState playing:true in onReady method 2020-02-12 17:39:45 -03:00
Lucas Zawacki
be9202a648 Adding some checks for null player in getCurrentTime and getCurrentPlaybackRate 2020-02-11 15:08:26 -03:00
Lucas Zawacki
fcecc3bcfe Fix playbackrate state when being set from local player 2020-02-11 15:08:24 -03:00
Lucas Zawacki
a90be659d7 Attempt to limit flow of presenterSync messages just in case 2020-02-11 15:08:21 -03:00
Lucas Zawacki
9f2826949d External video: don't use react state for flags that don't need re-renders 2020-02-11 15:08:18 -03:00
Lucas Zawacki
8165cba402 External video: prevent presenter from sending multiple unecessary play/pause messages 2020-02-11 15:08:13 -03:00
Lucas Zawacki
4ade850a5a Pause synced video if presenter exits the room 2020-01-13 13:53:49 -03:00
Lucas Zawacki
14fd979955 Remove viewerJoined logic and prevent handleOnReady from running multiple times 2020-01-13 13:53:47 -03:00
Chad Pilkey
7174050fb3 adjust external video sync interval and emit check 2019-10-23 13:29:06 -07:00
Lucas Zawacki
9c76f62e63 Fix multiple external videos synced to different meetings 2019-10-22 17:19:57 -03: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
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