Commit Graph

48 Commits

Author SHA1 Message Date
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
Augusto Bennemann
68c18ff70f Display a toast for screensharing not supported by Safari 2018-05-22 14:17:35 -03:00
Anton Georgiev
d6f91228d6
Merge pull request #5436 from Tainan404/issue-5419
Clear session storage to enter
2018-05-15 07:23:31 -04:00
Tainan Felipe
99df324d73 revert Boolean coversion 2018-05-08 15:01:35 -03:00
Tainan Felipe
2f52c9fdc5 remove only metadata 2018-05-08 09:26:04 -03:00
prlanzarin
95506e50d9 Fixed screenshare extension toast and removed dock leftover code 2018-04-27 15:11:40 +00:00
Oswaldo Acauan
fb6aeb90f9 Fix autosharewebcam option not working on first join 2018-04-25 11:23:44 -03:00
Oswaldo Acauan
ad57657b18 Add metatag html5hidepresentation 2018-04-24 13:18:12 -03:00
Oswaldo Acauan
c688eb23ca Move Polling to above slides/webcams and change swapLayout constraints. Closes #5359 2018-04-17 14:55:07 -03:00
Oswaldo Acauan
5b9433fc9f Fix webcams/sfu reconnect on every render and styles for 4:3 2018-04-11 15:50:14 -03:00
Oleksandr Zhurbenko
6c1e791adb Added a layer for the presentation pods component 2018-04-09 22:24:04 -07:00
Oswaldo Acauan
5bf71eee98 Add swap functionality 2018-04-09 15:48:21 -03:00
Oswaldo Acauan
fe11dd9a90 Improve media overlay/content styles 2018-04-09 15:28:54 -03:00
Tainan Felipe
d206ffde93 Comply lock setting 'see other viewer's webcams' 2018-04-04 10:10:46 -03:00
Lucas Fialho Zawacki
65a2fb592f Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor 2018-03-20 17:22:11 +00:00
Joao Siebel
cb70001f37 Implement notification when a presenter start and end a screenshare 2018-03-09 08:20:08 -03:00
João Francisco Siebel
9a2c797274 Fix problems with merge and language 2018-02-23 14:44:51 -03:00
João Francisco Siebel
6bb031076b Resolve merge problems 2018-02-19 14:00:43 -03:00
Lucas Fialho Zawacki
1b3633c8bd More components for video-dock 2018-02-16 19:24:35 +00:00
Lucas Fialho Zawacki
23b635b4ff Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-08 14:48:33 +00:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00
Tainan Felipe Pauli de Almeida
bc2da51bfb Comply lock setting 'Hide other viewer's webcams' 2018-02-06 09:43:14 -02:00
Tainan Felipe Pauli de Almeida
fd9dfbf89b fix more linter errors 2018-02-01 09:31:17 -02:00
Tainan Felipe Pauli de Almeida
1bdf08b260 lock logic passed to the parent 2018-02-01 09:09:33 -02:00
Tainan Felipe Pauli de Almeida
cba6628de0 add to the functionality of deactivating the videodock via settings 2018-01-30 14:32:37 -02:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
perroned
c64c97b582 Html5 clean up 2017-03-21 21:46:41 +00:00
perroned
03b854e6b1 Update media service for new name 2017-03-06 19:34:30 +00:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738 Fixed presentation imports 2017-02-23 10:15:25 -08:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
perroned
63953b1384 Hooking up viewing from html5 2016-08-19 14:07:47 +00:00
Oswaldo Acauan
0b8bca049c Hide webcam component 2016-07-11 10:13:55 -03:00
Oleksandr Zhurbenko
6db05cf0f4 Added scaling on window resize for the slide 2016-06-01 16:37:51 -07:00
Oleksandr Zhurbenko
949511f9b5 Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
Oleksandr Zhurbenko
36cfffd2db Fixed multiple rerenderings while changing slides
Media container is supposed to know only if a current presentation exists, not slide
2016-05-30 10:33:35 -07:00
Oleksandr Zhurbenko
179ce3c2bd Swapping whiteboard with default view if there is no current slide 2016-05-27 18:10:34 -07:00
Oswaldo Acauan
99c2e94c80 Remove unnecessary extension on imports 2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00