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
|
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 |
|
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 |
|
JaeeunCho
|
050994fc06
|
HTML5 - removed unused media query
|
2017-05-18 12:58:21 -07:00 |
|
KDSBrowne
|
7e96f7062f
|
replace FormattedMessage component with definedMessages
|
2017-04-07 05:44:05 -07:00 |
|
Oleksandr Zhurbenko
|
a50a883bf9
|
Switched to a different way of scaling the slide
|
2017-03-23 14:52:36 -07: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
|
7ca23e44cc
|
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-html5/imports/startup/server/EventQueue.js
bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
|
2016-09-14 19:30:07 +00:00 |
|
perroned
|
63953b1384
|
Hooking up viewing from html5
|
2016-08-19 14:07:47 +00:00 |
|
Oleksandr Zhurbenko
|
d510907179
|
Upgraded Meteor to 1.4
|
2016-07-27 14:50:35 -07:00 |
|
Oswaldo Acauan
|
0b8bca049c
|
Hide webcam component
|
2016-07-11 10:13:55 -03:00 |
|
Oleksandr Zhurbenko
|
25b55ba9d7
|
Switched to CSS scaling for SVG
|
2016-06-02 15:09:28 -07:00 |
|
Oleksandr Zhurbenko
|
6db05cf0f4
|
Added scaling on window resize for the slide
|
2016-06-01 16:37:51 -07:00 |
|
Oleksandr Zhurbenko
|
06e18808b3
|
Fixed a layout bug for the Firefox
|
2016-06-01 14:59:10 -07:00 |
|