Vitor Mateus
|
b667f3ce5b
|
Sets the webcam position fixed in mobile #6724
|
2019-03-25 11:43:02 -03:00 |
|
Vitor Mateus
|
90290c6b67
|
Merge remote-tracking branch 'upstream/master' into issue-6724
|
2019-03-22 17:54:23 -03:00 |
|
Joao Siebel
|
6d6ed2ca73
|
Avoid ns-error-failure and client crash. close #6857 and close #6710
|
2019-03-08 14:29:19 -03:00 |
|
Vitor Mateus
|
a3314945b9
|
Fix #6841
|
2019-03-04 16:02:07 -03:00 |
|
Vitor Mateus
|
1a35975d8c
|
Bugs fixes
|
2019-03-04 14:29:40 -03:00 |
|
Vitor Mateus
|
e1616c0a3b
|
Make sigle webcam draggable #6724
|
2019-02-28 18:39:57 -03:00 |
|
Pedro Beschorner Marin
|
c0510f74e6
|
Check data savings settings before showing screenshare
|
2019-02-05 10:59:39 -02:00 |
|
Anton Georgiev
|
38afdcf22b
|
Merge pull request #6640 from pedrobmarin/master-presentation-ui
New UI for presentation/video swap and fullscreen buttons
|
2019-01-28 12:33:47 -05:00 |
|
Lucas Zawacki
|
6d4d3daba3
|
Youtube video. Fix syntax, variable names, move some code into the service, remove unused code
|
2019-01-16 10:57:20 -03:00 |
|
Lucas Zawacki
|
9b2bc7c219
|
Correctly unmount youtube player area
|
2019-01-16 10:40:49 -03:00 |
|
Lucas Zawacki
|
e883d3a2b0
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui
|
2019-01-15 10:31:12 -03:00 |
|
Lucas Zawacki
|
550bbcd492
|
Share synchronized youtube video in presentation area
|
2019-01-14 14:40:27 -03:00 |
|
Anton Georgiev
|
01bedb5ec1
|
Merge pull request #6474 from vitormateusalmeida/fix-issue-6457
Fix z-index in presentation
|
2019-01-11 13:32:41 -05:00 |
|
KDSBrowne
|
e54823d174
|
fix presentation positioning when data saving is enabled
|
2019-01-08 14:46:24 +00:00 |
|
Lucas Zawacki
|
bb4a83900c
|
Fullscreen button for videos, presentation and screenshare
|
2019-01-07 15:15:37 -03:00 |
|
Lucas Zawacki
|
442eb9a472
|
Don't show presentation overlay when swappedw
|
2019-01-02 16:08:45 -03:00 |
|
Vitor Mateus
|
00fa8b2027
|
Fix z-index in presentation
|
2018-12-26 09:33:00 -02:00 |
|
Anton Georgiev
|
a6afd0314c
|
Merge pull request #6426 from antobinary/fix-6416
Fix 6416 - Clear All Status not working
|
2018-12-17 17:25:40 -05:00 |
|
Anton Georgiev
|
233e9e8b51
|
close #6416 - clear all status not working
|
2018-12-17 21:01:23 +00:00 |
|
Anton Georgiev
|
d12c01fb14
|
Merge pull request #6377 from KDSBrowne/hide-toolbar-onSwap
Hide presentation controls in swapped state
|
2018-12-14 15:32:48 -05:00 |
|
KDSBrowne
|
f16366c305
|
hide toolbar when presentation is swapped
|
2018-12-11 16:28:37 +00:00 |
|
KDSBrowne
|
462f20d9bb
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade
|
2018-12-05 20:54:37 +00:00 |
|
KDSBrowne
|
39c75fd449
|
fix remaining bugs / console errors
|
2018-12-05 19:31:33 +00:00 |
|
Maxim Khlobystov
|
3a313ad529
|
Make sure the video preview and audio modals don't interfere with each other.
|
2018-11-15 14:38:04 -05:00 |
|
Maxim Khlobystov
|
e9a6d387e4
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-14 17:20:43 -05:00 |
|
Maxim Khlobystov
|
9b27c89bc8
|
Adjustments to the autoShareWebcam
|
2018-11-07 16:45:52 -05:00 |
|
KDSBrowne
|
95bb36df82
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-25 17:25:26 +00:00 |
|
Anton Georgiev
|
ef9f248607
|
Merge branch 'master' into html5-theming
|
2018-10-24 14:58:59 -04:00 |
|
Anton Georgiev
|
ffbc11162e
|
fixed linter errors
|
2018-10-24 15:33:39 +00:00 |
|
Anton Georgiev
|
74c51e37c8
|
drop obsolete || false check
|
2018-10-24 12:46:05 +00:00 |
|
Anton Georgiev
|
57dc55b559
|
drop metadata configs; use userdata configs for autoSwap
|
2018-10-23 20:44:17 +00:00 |
|
Oswaldo Acauan
|
f71d32a464
|
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP
wip
wip
format
wip
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
|
2018-10-23 14:21:58 -02:00 |
|
KDSBrowne
|
9b42940d63
|
move polling options for viewer
|
2018-10-12 15:05:53 +00:00 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleksandr Zhurbenko
|
6046c6c5a9
|
Removed unnecessary wrappers and adjusted styling
|
2016-05-30 16:10:01 -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
|
0e6c6f1f99
|
Improve some styles on the media
|
2016-05-20 12:02:57 -03: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 |
|
Oswaldo Acauan
|
d81cb28f35
|
Add new component button and some basic styles
|
2016-05-20 10:37:19 -03:00 |
|
Maxim Khlobystov
|
67bb61c975
|
Code style cleanup.
|
2016-05-05 18:30:57 -04:00 |
|
Oswaldo Acauan
|
ddd38c57ac
|
Add i18n, modular layouts and basic styles
|
2016-05-03 17:40:46 -03:00 |
|
Oswaldo Acauan
|
01860a8804
|
Add basic styles for new design
|
2016-05-02 19:42:54 -03:00 |
|