BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,468 Commits 13 Branches 260 Tags 1.1 GiB
22641c0e33
Commit Graph

7317 Commits

Author SHA1 Message Date
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
d10ab8f4af Remove files containing incompatible (to BBB) license 2020-05-11 11:53:48 -04:00
Mikhail Novosyolov
64fbff1d8c Don't recommend Firefox or Chrome for WebRTC when Puffin is being used 
People use Puffin Browser only when they are on a mobile device and have to use
BBB flash client. They cannot use a browser with WebRTC support,
in our case, we in Dumalogiya temporarily disabled HTML5 version
due to problems with sharing webcams across HTML5 and Flash clients and we are
not ready to fully migrate to HTML5 client because it e.g. lacks support
of changing window layouts. So, we want to avoid showing this warning in Puffin Browser.
 2019-09-22 00:06:54 +03:00
Chad Pilkey
865d4e03bf fix lock settings in Flash after hideUserList added 2019-08-12 14:02:45 -07:00
Pedro Beschorner Marin
c27f409def Locking shared notes from akka-apps up to the Flash client 2019-05-08 20:36:36 +00:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Pedro Beschorner Marin
125e72dfd0 Added unmute viewers option to the Flash client 2019-04-11 17:34:53 +00:00
Richard Alam
3b4a10ebd5 - do not override settings from config.xml unless an override param is passed on create api call 2019-03-27 08:15:01 -07:00
Richard Alam
2a9e92379e - override breakout options from config.xml with params passed on create api 2019-03-26 14:47:37 -07:00
Richard Alam
2b7de74dcd - update flash locales to latest 2019-03-25 14:46:04 -07:00
Chad Pilkey
5507af57d1 remove unneeded whitespace in ChatTab 2019-03-15 14:08:01 -07:00
Chad Pilkey
b022318464 fix enter response parsing 2019-03-15 14:06:35 -07:00
Chad Pilkey
931bd35430 add cache busting to js files that were missing it 2019-03-15 10:34:16 -07:00
Chad Pilkey
242a9f019f add transfer dtmf resend for firefox users 2019-03-14 14:02:51 -07:00
Chad Pilkey
bb38e800c6 add missing bracket to UsersWindow 2019-03-05 15:55:08 -08:00
Chad Pilkey
54036cb0bf update Flash mute shortcut language 2019-03-05 13:26:11 -08:00
Chad Pilkey
73ed89d817 make breakout room renderer update with role change 2019-03-05 13:25:46 -08:00
Chad Pilkey
b5bcfadbea harden some priveledged functionality in the Flash client 2019-03-05 13:23:33 -08:00
Anton Georgiev
7d6f3eeb95
Merge pull request #6850 from capilkey/2.2-allow-pc-with-mod 
Fix private chat for viewers and allow private chat with moderators
 2019-03-04 16:24:07 -05:00
Chad Pilkey
83b6824af6 restore quick polling in Flash 2019-02-25 16:53:12 -08:00
Chad Pilkey
5a6d067e98 fix private chat for viewers and allow pc with mod 2019-02-25 16:19:41 -08:00
Chad Pilkey
160ea38f5b Replace double quotes in audio name with single quotes 2019-02-21 12:49:04 -08:00
Chad Pilkey
ff90c5815f add defaults for chrome ss link and key to config.xml template 2019-02-20 17:16:20 -08:00
Richard Alam
7c76930feb Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections 2019-02-09 08:27:12 -08:00
Chad Pilkey
269cb3d911 [Flash] add the raw UA to the browser_info log 2019-02-08 16:02:57 -08:00
Chad Pilkey
0e7bc8ae93 [Flash] use bowser for browser detection, fix ss browser detection 2019-02-08 14:49:48 -08:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02:00
Chad Pilkey
aed2556383 fix build warnings about duplicate variable names 2019-01-29 16:34:18 -08:00
Chad Pilkey
572e60f4e2 [Flash] Chrome screenshare extension only required for <72 2019-01-29 16:33:57 -08:00
Chad Pilkey
d5189549bf webrtc call is ready in Edge when ICE completed not connected 2019-01-29 16:11:20 -08:00
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