BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,462 Commits 13 Branches 260 Tags 1.1 GiB
9f2cfa8f35
Commit Graph

11462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
9f2cfa8f35 WebRTC deskshare services 2016-02-04 11:36:14 -08:00
perroned
93ce166d46 WebRTC deskshare event map 2016-02-04 11:23:55 -08:00
perroned
50832abc5f Add WebRTC deskshare events 2016-02-04 11:23:28 -08:00
perroned
cb628d085b Added new WebRTC event map 2016-02-04 11:21:55 -08:00
perroned
0f35624b82 Remove WebRTC deskshare from build 2016-02-04 11:21:04 -08:00
perroned
c13be65fe0 Update message receiver for WebRTC events 2016-02-04 11:18:16 -08:00
perroned
4c98822201 Add WebRTC option to config XML 2016-02-04 11:14:55 -08:00
perroned
b4649b41a2 Add explicit data type for messages 2016-02-04 11:10:03 -08:00
perroned
e3bc716ddf Move shared browser functions into BrowserCheck 2016-02-04 11:08:54 -08:00
perroned
5d39cd4cf4 Remove separate webrtc deskshare module 2016-02-04 10:53:03 -08:00
perroned
6a14cdc05d flash update hangup deskshare 2016-01-19 10:37:42 -08:00
perroned
7d8610b68c hangup debug information 2016-01-19 10:33:05 -08:00
perroned
e983919b88 configuring server credentials and fixed Flash gUM issues 2016-01-19 08:22:17 -08:00
perroned
77a6dd586d Support for html5 and Flash 2016-01-18 07:29:42 -08:00
perroned
0868322bb5 verto credentials 2016-01-18 07:29:03 -08:00
perroned
f2b5273160 mark screensharing as true on callback 2016-01-18 07:25:17 -08:00
perroned
0ec6efb6c4 only needed for html5 2016-01-18 07:24:46 -08:00
perroned
2216bf89a0 adding verto libraries 2016-01-18 07:24:13 -08:00
perroned
ffd1bf8672 Adding deskshare subscription to new routing method 2016-01-14 06:20:46 -08:00
Anton Georgiev
66e869e503 trying a different routing mechanism to address a routing bug with user lock 2016-01-14 06:09:14 -08:00
perroned
279f40a4c2 Updated Flash clients deskshare libs 2016-01-13 12:03:52 -08:00
perroned
4571b0532c media preview code 2016-01-13 10:37:10 -08:00
perroned
2a65639adb Use new deskshare collection 2016-01-13 10:06:57 -08:00
perroned
73c1eddc05 Updated parameters for initating verto calls. 2016-01-13 10:05:22 -08:00
perroned
e55ac3c7f8 Load deskshare libraries from Flash 2016-01-13 10:04:01 -08:00
perroned
ed1ed3ab05 Added deskshare collection 2016-01-13 10:02:11 -08:00
perroned
4ae45bff9b Updated verto audio joining 2016-01-13 10:01:00 -08:00
perroned
ee2f4a5dc3 Fix detection of when deskshare is initiated and ended through different collection 2016-01-13 10:00:28 -08:00
perroned
e7f8237a21 Removed deskshare library files from client 2016-01-13 10:00:17 -08:00
perroned
e7884e831b Merge remote-tracking branch 'anton/webrtc-desktop-temp-4' into html5client-mod-verto-addition-2 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2016-01-07 10:40:52 -08:00
Anton Georgiev
155aebdc65 allow late joining ds for html5 client, event if Meteor started late 2015-12-22 22:55:16 +00:00
Anton Georgiev
88d969cd45 fix string in common message 2015-12-22 22:50:34 +00:00
Anton Georgiev
2969c9136e html5 promote BBB.x vs getInSession where possible 2015-12-22 20:49:45 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
perroned
9775d5a2f8 Say FF addon isn't there until detection 2015-12-15 13:00:11 -08:00
perroned
5d08f78ad5 Add everything audio to its own file 2015-12-15 12:59:37 -08:00
Anton Georgiev
09a870296d reuse hover string from other ds method; skip chat notific on ds start/end 2015-12-14 20:45:46 +00:00
Anton Georgiev
7b15231cdb cleaning up issues with webrtc ds display 2015-12-11 22:39:00 +00:00
Anton Georgiev
cad6c2a175 add a check for user 2015-12-11 20:32:44 +00:00
Anton Georgiev
1a2447b5b9 hooking up to server side 2015-12-11 20:30:55 +00:00
Anton Georgiev
5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-12-11 17:23:27 +00:00
Anton Georgiev
105fb2495d avoid issues oberved in verto 2015-12-11 16:45:36 +00:00
perroned
34aa2b03fc Use voice bridge received from server 2015-12-10 10:55:30 -08:00
perroned
5c74f5f446 Update whiteboard controls template 2015-12-10 10:38:27 -08:00
perroned
7625a199b1 Add deskshare object to meetings 2015-12-10 07:58:25 -08:00
perroned
0a3f91c65b Fixed indentation error 2015-12-10 07:58:06 -08:00
Anton Georgiev
97bcb025b6 add webrtc deskshare module; comment out old deskshare module 2015-12-09 20:36:37 +00:00
Anton Georgiev
6c9493ec60 make local publish default 2015-12-09 16:46:38 +00:00
perroned
2d404323c6 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/stylesheets/mixins.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/redispubsub.coffee
 2015-12-09 08:40:13 -08:00
perroned
9668719929 Update verto libraries 2015-12-07 10:38:15 -08:00