perroned
|
2a23778ea9
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
|
2016-07-22 19:20:00 +00:00 |
|
Oswaldo Acauan
|
9b53090c81
|
Change Auth service to be a singleton class
|
2016-07-11 13:45:24 +00:00 |
|
perroned
|
c1e0605852
|
Simplfy watch video initiation
|
2016-06-21 17:38:28 +00:00 |
|
Anton Georgiev
|
4195905c2b
|
change audio to default to SIP
|
2016-06-21 15:34:10 +00:00 |
|
perroned
|
86035fce39
|
Adds verto manager window functions
|
2016-06-17 17:47:24 +00:00 |
|
perroned
|
a95ed82293
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
|
2016-06-15 20:07:42 +00:00 |
|
Oswaldo Acauan
|
f39b7171af
|
Move session/auth logic to separated services
|
2016-06-02 10:46:35 -03:00 |
|
perroned
|
4977950081
|
Fixes crash when starting video view
|
2016-05-30 17:21:30 +00:00 |
|
perroned
|
c8fdf66099
|
Lints
|
2016-05-27 16:34:03 +00:00 |
|
perroned
|
393b49fdbe
|
Cleans up duplicate code
|
2016-05-27 16:17:16 +00:00 |
|
perroned
|
2f9afaa8d6
|
Uses same name for voiceBridge where possible
|
2016-05-26 20:25:55 +00:00 |
|
perroned
|
ac60620ac9
|
Makes WebRTC call when data changes
|
2016-05-26 20:03:45 +00:00 |
|
perroned
|
b8ae3a5304
|
Fixes some imports
|
2016-05-26 20:01:49 +00:00 |
|
perroned
|
d12c31e324
|
Moving components to structure
|
2016-05-13 09:39:10 -05:00 |
|