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 |
|