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

7285 Commits

Author SHA1 Message Date
prlanzarin
4172a15a36 Check if the mediaDevices scope existes before checking for gDM availability 2019-01-28 18:48:06 +00:00
Chad Pilkey
7697f48cf1
Merge pull request #6610 from prlanzarin/fix-ch-ss-new-adapter 
[2.2][Flash] Fixed Chrome extension-based screensharing with latest adapter
 2019-01-25 14:47:33 -05:00
Chad Pilkey
4e2f876f61
Merge pull request #6609 from capilkey/2.2-edge-webrtc 
[2.2] Remove WebRTC blocks for Edge and update adapter.js
 2019-01-25 14:47:21 -05:00
Chad Pilkey
4d9d0aaf23 update the copyright in 2.2 Flash client to 2019 2019-01-22 14:14:35 -08:00
prlanzarin
1d03025705 Fixed Chrome extension-based screensharing with the newest adapter on Flash 2019-01-22 17:26:27 +00:00
prlanzarin
544d2ad38b Improved getDisplayMedia detection 2019-01-21 21:04:59 +00:00
Chad Pilkey
743caa2d15 remove WebRTC blocks for Edge and update adapter.js 2019-01-21 11:25:32 -08:00
prlanzarin
04ec52111a Reorganized the gDP code a bit to also support Edge 2019-01-03 18:17:13 +00:00
prlanzarin
c2646b78a2 Add support for getDisplayMedia on Chrome 2019-01-03 17:08:41 +00:00
Chad Pilkey
c4554211f1 create RTCPeerConnection with sdpSemantics:plan-b for Chrome unified-plan 2018-12-18 13:29:09 -08:00
Ghazi Triki
5507de2e9f Disable group chats, presentation download and add a new configuration entry fir multi-presentation pods. 2018-12-09 21:03:09 +01:00
Ghazi Triki
827a900d9a Update MainApplicationShell code style. 2018-11-02 20:58:12 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Chad Pilkey
214e3283df
Merge pull request #6187 from ritzalam/delay-removing-user-when-leaving 
Delay removing user when leaving
 2018-10-25 13:20:18 -04:00
Richard Alam
62e74c365f - when receiving the get users and get voice users response, check if the received users 
are in the old users list or they are new ones. Need to remove users not on the new user's list
   as they might have left during auto-reconnects.
 2018-10-25 09:08:56 -07:00
Fred Dixon
b4a4f957dd
Update bbbResources.properties 
Update quotes
 2018-10-24 16:24:44 -04:00
Chad Pilkey
539e29d8d4
Merge pull request #6185 from capilkey/fix-flash-reconnect-attempts 
Fix Flash reconnect attempts
 2018-10-24 16:03:54 -04:00
Chad Pilkey
fac51f1a64
Merge pull request #6186 from capilkey/remove-webrtc-stats 
[Flash] disable the webrtc audio stats
 2018-10-24 15:13:43 -04:00
Chad Pilkey
89921f7f5a [Flash] disable the webrtc audio stats 2018-10-24 12:08:24 -07:00
Chad Pilkey
83c2ceec76 fix Flash reconnect attempts 2018-10-24 12:02:52 -07:00
Richard Alam
fd36501c84 - check to make sure user is not kicked out of voice conference even when joined using webrtc when 
flash client auto-reconnects.
 2018-10-23 10:55:51 -07:00
Ghazi Triki
881978b187 Fix breakout rooms buttons visibility for moderators. 2018-10-16 14:50:30 +01:00
Chad Pilkey
8df89ceb78 increase the ICE negotiation timeout from 5 to 10s 2018-10-12 13:26:51 -07:00
Chad Pilkey
237020d726 fix the tooltips for the screenshare type buttons 2018-10-11 13:46:43 -07:00
Richard Alam
909b8672c7
Merge pull request #6096 from riadvice/api-started-screen-sharing 
Improve client logging for screensharing
 2018-09-21 13:21:03 -04:00
Ghazi Triki
d6b22822e9 Improve java and webrtc screensharing logs. 2018-09-21 14:10:41 +01:00
Chad Pilkey
15f80dd8ea reduce adapter.js version in Flash client because newer breaks Chrome webrtc ss 2018-09-20 14:14:41 -07:00
Ghazi Triki
f33f4bc33f Revert "Update API to display if the user is sharing his screen and what screen-sharing type he is using." 
This reverts commit 72d7e17fdb.
 2018-09-20 20:48:38 +01:00
Chad Pilkey
9f8c0465d8 update adapter.js in the Flash client and make sure it loads in correct order 2018-09-20 12:29:35 -07:00
Ghazi Triki
72d7e17fdb Update API to display if the user is sharing his screen and what screen-sharing type he is using. 2018-09-20 18:16:29 +01:00
Richard Alam
196d58e9db
Merge pull request #6082 from capilkey/fix-client-failed-load 
Fix error handling when client parts fail to load
 2018-09-19 13:45:11 -04:00
Chad Pilkey
2b74772f3e adjust the valid config.xml check in ConfigManager2 2018-09-19 10:38:15 -07:00
Chad Pilkey
98f7aaaeb6 fix error handling when client parts fail to load 2018-09-18 12:45:12 -07:00
Chad Pilkey
76fc918c55 make Flash WebRTC screenshare use rtmps when available 2018-09-18 10:38:04 -07:00
Chad Pilkey
c2de25065f
Merge pull request #6073 from capilkey/ipv4-rtmp-fallback 
Fix WebRTC screenshare RTMP URL regular expression
 2018-09-13 16:33:57 -04:00
Chad Pilkey
284eb91b91 fix WebRTC screenshare RTMP url regular expression 2018-09-13 13:32:22 -07:00
Chad Pilkey
74151a4dff
Merge pull request #6070 from riadvice/fix-lock-for-late-joiners 
Fix lock settings
 2018-09-13 14:12:59 -04:00
Chad Pilkey
1f6833b1f0 add a specific log message when falling back to rtmp ipv4 2018-09-13 08:52:51 -07:00
Chad Pilkey
911e99733c add rtmp fallback for ipv4-only hostname to the client 2018-09-12 13:49:27 -07:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Ghazi Triki
0873fe7a96 Request lock settings after all modules were loaded. 2018-09-12 18:21:02 +01:00
Richard Alam
408a780cb3
Merge pull request #5965 from riadvice/rtl-minor-improve 
Update help button icon for RLT layout
 2018-09-12 12:19:38 -04:00
Ghazi Triki
0733a608d5 More delay for updating layout lock the first time. 2018-09-12 13:43:53 +01:00
Ghazi Triki
d95f834dfc FIx layout lock for late joiners. 2018-09-12 13:18:41 +01:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Chad Pilkey
e3d9864f75 reset rolledOver when user itemrenderers are used for a different user 2018-09-06 13:43:37 -07:00
Chad Pilkey
44ec61c9ce add warning to Flash for WebRTC SS in FF on Mac 2018-08-31 13:44:18 -07:00
Ghazi Triki
83031aab94 Add user typing locale strings. 2018-08-14 17:54:31 +01:00
Ghazi Triki
8fc6e03354 Updated too long message and user typing labels positions. 2018-08-14 12:39:24 +01:00