perroned
|
8106742d45
|
Restructuring deskshare api
|
2017-02-22 16:22:51 +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 |
|
Oleksandr Zhurbenko
|
7054b36721
|
Minor corrections
|
2016-08-22 08:34:46 -07:00 |
|
perroned
|
63953b1384
|
Hooking up viewing from html5
|
2016-08-19 14:07:47 +00:00 |
|
Anton Georgiev
|
6a984c2b68
|
adding captions support in html5 (part1)
|
2016-07-14 12:03:30 -07:00 |
|
Anton Georgiev
|
9cf03a8ce8
|
move helpers; extract nodejsApp
|
2016-06-01 17:18:13 +00:00 |
|
perroned
|
2f9afaa8d6
|
Uses same name for voiceBridge where possible
|
2016-05-26 20:25:55 +00:00 |
|
perroned
|
4adad8bb32
|
Changes credential passing to 1 object
|
2016-05-16 13:12:27 -05:00 |
|
perroned
|
98aae7aade
|
Changes collection imports
|
2016-05-16 13:05:44 -05:00 |
|
perroned
|
109a8da350
|
Fixes whitespace
|
2016-05-16 09:14:28 -05:00 |
|
perroned
|
d966aee2d7
|
Fixing paths for structure
|
2016-05-12 14:50:02 -05:00 |
|
Anton Georgiev
|
6a92c9400b
|
restructure modifiers and methods
|
2016-05-12 17:43:59 +00:00 |
|
Anton Georgiev
|
699fde7344
|
accommodate for poll and deskshare
|
2016-05-10 20:25:24 +00:00 |
|
perroned
|
587627562c
|
Fixes some api structure
|
2016-05-10 10:23:22 -05:00 |
|
perroned
|
67115c0169
|
Begins adding deskshare functionality
|
2016-05-06 15:15:47 -05:00 |
|