BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,828 Commits 13 Branches 260 Tags 1.1 GiB
c04e3da068
Commit Graph

386 Commits

Author SHA1 Message Date
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
Richard Alam
d39e823a85 Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages 2017-07-27 07:53:27 -07:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
prlanzarin
f64d393b6a Cleanup on kurento client extension 
Added fail cases to fallback to JWS
 2017-07-17 19:30:58 +00:00
perroned
ef50f8733f Enable stun/turn use 2017-07-14 11:15:58 -04:00
Richard Alam
8d1b36cd48 Merge pull request #4074 from perroned/update-verto-libs-add-ff 
Update verto libs add firefox screenshare support
 2017-07-12 14:28:13 -04:00
perroned
f3f877057a Verto extension deskshare -> screenshare 2017-07-12 11:33:02 -04:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
perroned
ecbc290436 Adds FF SS support 2017-07-11 12:24:50 -04:00
perroned
a1554c0176 Updates verto lib 2017-07-11 10:59:32 -04:00
prlanzarin
1395893397 Fixed ending methods for kurento-extension 2017-07-10 20:51:37 +00:00
perroned
020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
 2017-07-09 14:39:57 -04:00
perroned
1b92aba481 Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
perroned
f92be502cc Moves constraints to initialization 2017-07-07 17:01:33 -04:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html 
Generic addresses for Kurento on the screenshare server
 2017-07-05 17:58:19 +00:00
prlanzarin
89fe4df880 Merge branch '1.1-transcode' of https://github.com/pedrobmarin/bigbluebutton into 1.1-transcode-screenshare-merge 2017-07-04 16:27:14 +00:00
prlanzarin
5b8109a566 Added support for Firefox WebRTC screensharing with KMS 
Fixed Chrome getUserMedia constraints

Added client-side draft methods for HTML5 screenshare
 2017-07-03 19:13:00 +00:00
prlanzarin
251cd67df4 Added first prototype of Kurento WebRTC screenshare client module 2017-06-13 20:18:21 +00:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Ghazi Triki
7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x 
# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb
 2017-05-22 17:35:24 +01:00
perroned
a7c2542c0a Overwrites popup function 2017-05-15 12:16:30 -04:00
Richard Alam
44e3fb8a07 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-05-08 08:51:31 -07:00
Fred Dixon
26a62bd398 Merge pull request #3907 from kepstin/webrtc-stats 
Update webrtc stats bridge for modern Chrome/Firefox APIs
 2017-05-05 14:21:48 -04:00
Calvin Walton
75c680832c Update webrtc stats bridge for modern Chrome/Firefox APIs 
Switch to the promise-based getStats, and use the standardized
property names where available, with fallback to handle Chrome,
which hasn't fully switched yet.

The stats now only track the outgoing audio stream, as a way to
indicate quality, since the user can't hear themselves. This
might be revisited later; it would require tracking the stats
separately for incoming vs. outgoing and e.g. returning whichever
is worse.
 2017-05-05 11:22:38 -04:00
Richard Alam
23e6dea35b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-05-04 14:39:02 -07:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
perroned
1d7ba676da Update verto libs 2017-05-03 14:12:42 +00:00
perroned
4b6c95f1c9 Adds chrome tabs to extension 2017-05-02 15:01:05 +00:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Ghazi Triki
92554f8b3e Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Ubuntu
8445c49f92 - add dimension of screen share 2017-03-29 15:58:43 +00:00
Ubuntu
e6796bf3ea Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:25:47 +00:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
Chad Pilkey
4515c08654 changes to shortcut keys so they all work in IE 2017-03-22 19:53:12 -04:00
perroned
cb124961a2 Connect to /verto endpoint 2017-03-22 22:20:15 +00:00
Ubuntu
a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-22 20:37:41 +00:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
perroned
47c6e3fe69 Puts back resolution values into screen constraints 2017-03-21 17:14:36 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
perroned
dd6f869059 Fixes exceptions and jnlp download issue 2017-03-13 21:20:13 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Chad Pilkey
0235dd5adb fix plus and minus shortcut modifier in key table 2017-03-08 19:26:02 -05:00
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
Anton Georgiev
ad59c80853 adjust ExternalApiCalls for multiple recovered cams 2017-03-01 13:56:10 -05:00