Commit Graph

34 Commits

Author SHA1 Message Date
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
Anton Georgiev
d26225b05d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-03-31 15:21:14 -04:00
Anton Georgiev
8893b3ce19 instantiate audioManager with bridge 2017-03-31 11:46:33 -04:00
Anton Georgiev
afcb365ac6 turned the audio services into classes 2017-03-30 13:57:05 -04:00
Anton Georgiev
6de1c470a1 split phone and verto into audio/main sip-bridge and verto-bridge 2017-03-29 14:46:33 -04:00
Anton Georgiev
f4aeb3f7ee move phone api to audio/service.js 2017-03-28 10:02:23 -04:00
perroned
c64c97b582 Html5 clean up 2017-03-21 21:46:41 +00:00
perroned
8c338f42d2 Fixes bug with call not always going through x2 2017-03-21 17:00:58 +00:00
perroned
3dfb5bba43 Fixes bug with call not always going through 2017-03-21 15:42:14 +00:00
perroned
dcdd4d0756 Cleans up html5 2017-03-06 20:30:07 +00:00
perroned
05d32bdbd3 Removes html5 video player controls 2017-02-27 18:18:54 +00:00
perroned
2f0b726ede Missing comma 2017-02-23 19:05:53 +00:00
perroned
8916f6e0e5 Fixes deskshare restart - html5 2017-02-23 19:00:20 +00: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
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
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00: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
Oswaldo Acauan
99c2e94c80 Remove unnecessary extension on imports 2016-05-20 10:46:30 -03:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
67115c0169 Begins adding deskshare functionality 2016-05-06 15:15:47 -05:00