BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,065 Commits 13 Branches 260 Tags 1.1 GiB
43efd5b094
Commit Graph

79 Commits

Author SHA1 Message Date
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
46559833e2 Add metatag html5autosharewebcam 2018-04-24 12:51:41 -03:00
Oswaldo Acauan
6beada63eb Add metatag html5autoswaplayout 2018-04-24 12:23:54 -03:00
Oswaldo Acauan
8dea5de7fe Fix polling/webcams margins 2018-04-17 15:04:16 -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
86b2cb0040 Fix presentation and webcam not resizing correctly 2018-04-17 10:09:00 -03:00
Oswaldo Acauan
599a1935d4 Improve webcam gaps sizing 2018-04-12 09:41:49 -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
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
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00
Oswaldo Acauan
ad246a1c7f Merge remote-tracking branch 'upstream/v2.0.x-release' into webcams-styling 2018-04-04 16:36:45 -03:00
Oswaldo Acauan
c39117b8dd Revert and fix videoDock styles 2018-04-04 16:09:28 -03:00
Oswaldo Acauan
0510490dd5 Improve presentation/whiteboard controls and fix presentation area sizing 2018-04-04 15:18:46 -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
9967e0f66e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock 2018-02-14 16:22: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
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Augusto Bennemann
541b06393c Video positioning. Code still bad. 2018-02-07 13:11:52 -02: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
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08: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
prlanzarin
76f09e16ad Adding checks to show screenshare and video overlays according to config file 2017-11-11 01:36:55 +00:00
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03: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
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Oleksandr Zhurbenko
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00