Anton Georgiev
|
bc99a999d8
|
Merge pull request #8519 from vitormateusalmeida/issue-8518
Fixes maximum width and height when no webcams
|
2020-01-22 16:02:59 -05:00 |
|
Vitor Mateus
|
010dbb727f
|
Fixes render loop #8526
|
2020-01-22 12:18:32 -03:00 |
|
Anton Georgiev
|
e847c4eab8
|
Merge pull request #8426 from KDSBrowne/issue-8341
Fix exception when publishing poll while presentation swapped (chrome)
|
2020-01-21 09:47:09 -05:00 |
|
Vitor Mateus
|
7828725686
|
Fixes maximum width and height when no webcams #8518
|
2020-01-21 10:57:32 -03:00 |
|
Vitor Mateus
|
1ae6324392
|
Detect aspect ratio to autochange webcams placement #8504
|
2020-01-17 10:20:03 -03:00 |
|
Vitor Mateus
|
822e11fdae
|
Change minimum size os presentatio if is mobile and landscape
|
2020-01-13 17:05:30 -03:00 |
|
Vitor Mateus
|
5b361df9f8
|
Fix recalculate area size after device rotate and drop end
|
2020-01-13 16:41:35 -03:00 |
|
Vitor Mateus
|
9676bbc434
|
Merge remote-tracking branch 'upstream/master' into issue-7850-2
|
2020-01-13 16:36:02 -03:00 |
|
Vitor Mateus
|
cc943498e2
|
Fix check if is mobile to disable draggable
|
2020-01-10 17:20:26 -03:00 |
|
KDSBrowne
|
9b57ab7ad3
|
fix annotation exception when publishing poll while presentation swapped (chrome)
|
2019-12-12 18:21:23 +00:00 |
|
Vitor Mateus
|
32e6903545
|
Fix placement size after resize and change placement
|
2019-12-10 18:43:22 -03:00 |
|
Pedro Beschorner Marin
|
3b591a086b
|
Unified video providers
|
2019-12-10 09:02:16 -03:00 |
|
Pedro Beschorner Marin
|
9fcae355c7
|
joinVideo gets the deviceId
|
2019-12-10 08:21:22 -03:00 |
|
Pedro Beschorner Marin
|
debd8f714a
|
Removed unused session vars logic
|
2019-12-10 08:21:21 -03:00 |
|
Pedro Beschorner Marin
|
3d2dd9b11c
|
Sharing webcam with deviceId prefix
|
2019-12-10 08:21:20 -03:00 |
|
Pedro Beschorner Marin
|
4eb67c12be
|
Multiple webcams first commit
|
2019-12-10 08:21:19 -03:00 |
|
Vitor Mateus
|
fce072681f
|
Fix overflow and resize when placement left or right
|
2019-12-05 17:01:54 -03:00 |
|
Vitor Mateus
|
0baf41bc0b
|
Fix webcam position when drop on left or right sides
|
2019-12-05 15:01:23 -03:00 |
|
Vitor Mateus
|
9344f62f26
|
Partial changes for webcam placement
|
2019-12-02 17:21:34 -03:00 |
|
Vitor Mateus
|
9ef5a62f70
|
Single webcam dropping in all sides
|
2019-11-25 13:38:00 -03:00 |
|
Anton Georgiev
|
cfb58749e4
|
Merge pull request #8303 from vitormateusalmeida/webcam-resizable
Webcam resizable
|
2019-11-08 15:28:58 -05:00 |
|
Vitor Mateus
|
f1733d0c02
|
Fix minimum size
|
2019-11-05 18:42:35 -03:00 |
|
Vitor Mateus
|
62ea5f247c
|
Fix webcam size when minimize presentation
|
2019-11-05 16:40:29 -03:00 |
|
Vitor Mateus de Almeida
|
3f1ff2c65c
|
Fix webcam size when minimize presentation
|
2019-11-05 16:26:45 -03:00 |
|
Vitor Mateus
|
c345be954e
|
Fix re-render in draggable component
|
2019-11-05 16:23:40 -03:00 |
|
Vitor Mateus
|
0e67c0e523
|
Resize improvements
|
2019-11-05 16:23:00 -03:00 |
|
Vitor Mateus
|
67e6b90fae
|
Anable resize when single webcam
|
2019-11-05 16:22:38 -03:00 |
|
Vitor Mateus
|
c0005b93c1
|
Webcams area resizable
|
2019-11-05 16:22:01 -03:00 |
|
Anton Georgiev
|
42d640f3e2
|
Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805
|
2019-11-05 11:59:00 -05:00 |
|
Anton Georgiev
|
8da73912f5
|
Revert "Webcams area resizable"
|
2019-11-01 14:24:18 -04:00 |
|
Vitor Mateus de Almeida
|
02732a8dbe
|
Merge remote-tracking branch 'upstream/master' into issue-7855
|
2019-10-31 18:17:30 -03:00 |
|
Vitor Mateus de Almeida
|
5686bb223a
|
Fix webcam size when minimize presentation
|
2019-10-31 18:11:26 -03:00 |
|
Vitor Mateus
|
a7b05b3b49
|
Fix re-render in draggable component
|
2019-10-14 18:30:13 -03:00 |
|
Joao Siebel
|
f365c50fd0
|
Relax autoSwapLayout constraints
now it's possible to minimize the presentation even if there
is no webcam being shared.
close #8129
|
2019-09-26 17:14:05 -03:00 |
|
Lucas Zawacki
|
5dd46f8f48
|
Fix video swap when there's no presentation and/or screenshare/external video
|
2019-09-17 16:55:52 -03:00 |
|
Vitor Mateus
|
5d7470a251
|
Resize improvements
|
2019-09-17 15:25:28 -03:00 |
|
Anton Georgiev
|
43c0670ed8
|
Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player
|
2019-09-10 16:35:50 -04:00 |
|
Vitor Mateus
|
04a709cd32
|
Anable resize when single webcam
|
2019-09-10 16:41:11 -03:00 |
|
Vitor Mateus
|
4d14604bf1
|
Merge remote-tracking branch 'upstream/master' into issue-7855
|
2019-09-09 13:40:10 -03:00 |
|
Anton Georgiev
|
ea18b09311
|
add a few more collection lookups "fields" delimiters
|
2019-08-29 12:26:07 -04:00 |
|
Vitor Mateus
|
5dbe7141f6
|
Merge remote-tracking branch 'upstream/master' into issue-7855
|
2019-08-27 16:46:19 -03:00 |
|
Lucas Zawacki
|
546f4cdac5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player
|
2019-08-27 15:09:40 -03:00 |
|
Anton Georgiev
|
5b9c835513
|
Merge pull request #7882 from prlanzarin/2.2-ap-ui
Add UI prompts when autoplay is blocked for video/screenshare/listen only
|
2019-08-14 15:24:16 -04:00 |
|
Chad Pilkey
|
4b1c92b50a
|
Merge remote-tracking branch 'upstream/master' into hide-user-list
|
2019-08-09 15:45:15 -07:00 |
|
Chad Pilkey
|
6e76dd584b
|
improve user fetch and sort, and webcam fetch
|
2019-08-09 15:39:55 -07:00 |
|
Vitor Mateus
|
5d7f44cf32
|
Fix single webcam overflow #7894
|
2019-08-07 17:57:41 -03:00 |
|
prlanzarin
|
42b651a1c6
|
Max autoplay overlay z-index to avoid odd stuff
|
2019-08-06 16:33:37 +00:00 |
|
Vitor Mateus
|
cccc8f4cf0
|
Fix log errors on webcam draggable
|
2019-08-05 18:17:39 -03:00 |
|
prlanzarin
|
9942dd0aa2
|
Merge remote-tracking branch 'upstream/master' into 2.2-ap-ui
|
2019-08-02 21:36:44 +00:00 |
|
prlanzarin
|
8d65ce565d
|
Add UI prompts when autoplay is blocked for video/screenshare/listen only
|
2019-08-02 21:32:42 +00:00 |
|
Vitor Mateus
|
8b91531043
|
Fix cursor stuck on dragging in firefox #7824
|
2019-08-01 11:19:16 -03:00 |
|
Vitor Mateus
|
5bbc1c4b3c
|
Merge remote-tracking branch 'upstream/master' into issue-7855
|
2019-07-31 17:45:35 -03:00 |
|
Vitor Mateus
|
ea7f4cff58
|
Remove events when unmount
|
2019-07-30 12:03:29 -03:00 |
|
Vitor Mateus
|
3c0898b7aa
|
Merge remote-tracking branch 'upstream/master' into issue-7022-2
|
2019-07-29 17:10:34 -03:00 |
|
Vitor Mateus
|
8ffc783fcd
|
Webcams area resizable
|
2019-07-29 16:42:11 -03:00 |
|
Vitor Mateus
|
2617fb34a1
|
Disable draggable when webcam is fullscreen
|
2019-07-26 16:42:39 -03:00 |
|
Vitor Mateus
|
1d44ee5794
|
Fix fullscreen multiwebcams
|
2019-07-26 16:24:53 -03:00 |
|
Vitor Mateus
|
e8f15b97b6
|
Fix fullscreen edge cases
|
2019-07-26 13:48:51 -03:00 |
|
Chad Pilkey
|
e69931a0af
|
Merge remote-tracking branch 'upstream/master' into fix-pan-lag
|
2019-07-25 16:29:52 -07:00 |
|
prlanzarin
|
39cf33b194
|
Yet another workaround for autoplay issues
|
2019-07-25 17:36:19 +00:00 |
|
Vitor Mateus
|
fc75100bb4
|
Disable draggable when webcam is fullscreen
|
2019-07-24 14:21:04 -03:00 |
|
Diego Benetti
|
f13239674b
|
Changes other parameters to the new pattern
|
2019-07-24 14:04:46 -03:00 |
|
Vitor Mateus
|
db1825a15c
|
Code cleanups
|
2019-07-23 19:24:31 -03:00 |
|
Diego Benetti
|
4a764f8f6c
|
Implements new name for parameters and the support to the old names
|
2019-07-22 11:28:13 -03:00 |
|
Anton Georgiev
|
d385466398
|
Merge pull request #7784 from diegobenetti/issue7769-change-enableExternalVideo-parameter
Changes the position of the parameter enableExternalVideo in the settings.yml
|
2019-07-17 16:53:42 -04:00 |
|
Lucas Zawacki
|
a2068d06b6
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player
|
2019-07-16 17:33:27 -03:00 |
|
Anton Georgiev
|
901987282a
|
Merge pull request #7756 from vitormateusalmeida/webcams-draggable-refactor
Webcam draggable refactoring
|
2019-07-16 09:53:39 -04:00 |
|
Diego Benetti
|
aa0c777cee
|
Parameter enableExternalVideo changed to externalVideoPlayer
|
2019-07-15 16:31:28 -03:00 |
|
Diego Benetti
|
f7a58c3279
|
Changes the position of the parameter enableExternalVideo in the settings.yml file
|
2019-07-15 13:26:57 -03:00 |
|
Anton Georgiev
|
9e2bc6e7f1
|
hide scrollbar for media (webcams)
|
2019-07-12 22:18:09 +00:00 |
|
Lucas Fialho Zawacki
|
e98333c45e
|
Use react-player for external video
|
2019-07-12 20:08:55 +00:00 |
|
Vitor Mateus
|
eb8cae8f4e
|
Fix draggable when screensharing
|
2019-07-12 15:36:39 -03:00 |
|
Vitor Mateus
|
fc3f23266b
|
Fix z-index
|
2019-07-11 10:49:06 -03:00 |
|
Vitor Mateus
|
68ec6411aa
|
Webcam draggable refactoring
|
2019-07-09 20:11:48 -03:00 |
|
Anton Georgiev
|
a66aa70707
|
Merge branch 'master' into issue7325-autoswaplayout-screenshare
|
2019-06-26 12:40:30 -04:00 |
|
Vitor Mateus
|
60185d84c1
|
Fix webcams overflow with scroll
|
2019-06-26 09:02:29 -03:00 |
|
Vitor Mateus
|
e5d56bad7a
|
Fixes
|
2019-06-25 12:40:57 -03:00 |
|
Diego Benetti
|
f383ccb8cc
|
Fixes client to obey custom parameter autoSwapLayout
|
2019-06-24 18:01:54 -03:00 |
|
Vitor Mateus
|
88244be139
|
Fix webcams size when minimize presentation
|
2019-06-24 15:37:17 -03:00 |
|
Vitor Mateus
|
9fc2413292
|
CSS and position calcs changes
|
2019-06-21 17:52:43 -03:00 |
|
Vitor Mateus
|
762d23089e
|
Partial webcams grid improvements
|
2019-06-19 17:55:43 -03:00 |
|
Diego Benetti
|
0ad8c228b4
|
Fixes performance bug when youtube video is shared
|
2019-06-17 11:10:45 -03:00 |
|
Vitor Mateus
|
b07cb6d15e
|
Add removeEventListener on unmount
|
2019-06-10 16:29:58 -03:00 |
|
Vitor Mateus
|
272b1a3e30
|
Fix position updates while speak
|
2019-06-10 15:25:55 -03:00 |
|
Vitor Mateus
|
0c81eda94e
|
Fix webcam size after minimize the presentation #7570
|
2019-06-07 17:45:54 -03:00 |
|
Vitor Mateus
|
6896cc08b4
|
Fix overflow of webcams-draggable #7562
|
2019-06-03 17:03:59 -03:00 |
|
Vitor Mateus
|
90f8b62d3f
|
Fix presentations resize
|
2019-06-03 11:33:06 -03:00 |
|
Vitor Mateus
|
7af426d0d2
|
Avoid webcam overflow the screen with multiples webcams
|
2019-06-03 11:05:09 -03:00 |
|
Vitor Mateus
|
4876f5d7a5
|
Avoid webcam overflow the screen
|
2019-05-30 15:19:18 -03:00 |
|
Vitor Mateus
|
6de7650ec9
|
Merge remote-tracking branch 'upstream/master' into issue-6724
|
2019-05-27 19:18:26 -03:00 |
|
Vitor Mateus
|
d1b910a558
|
Fix errors in grid layout
|
2019-05-27 19:06:52 -03:00 |
|
Anton Georgiev
|
88cfd6bde8
|
Merge pull request #7277 from Tainan404/issue-7200
Stop webcams when opens audio modal.
|
2019-05-22 11:36:53 -04:00 |
|
Ghazi Triki
|
28132b5b25
|
Fix media and action bar styles for RTL.
|
2019-05-15 18:04:00 +01:00 |
|
Vitor Mateus
|
0ade45e8cd
|
Bugs fixes, code Improvements and cleanups.
|
2019-04-23 17:23:32 -03:00 |
|
Tainan Felipe
|
0a730bcf62
|
Stop webcams when open audio modal
|
2019-04-18 15:48:39 -03:00 |
|
Vitor Mateus
|
18965d66fd
|
Fix Draggable in firefox
|
2019-04-11 13:35:23 -03:00 |
|
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 |
|