BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,233 Commits 13 Branches 260 Tags 1.1 GiB
15c4e09bd6
Commit Graph

1185 Commits

Author SHA1 Message Date
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Richard Alam
066395c440 - make configurable how client talks to server (default Red5) 2018-06-19 14:40:12 -07:00
Richard Alam
384fdb3e16 Merge branch 'reroute-client-messages' of github.com:ritzalam/bigbluebutton into merge-reroute-client-msgs 2018-06-19 14:28:24 -07:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Ghazi Triki
9b274dd1f8 Fix locale Haitian Creole name. 2018-06-11 15:09:43 +01:00
Ghazi Triki
1a9374f19d Add Haitian locale to flash client. 2018-06-08 14:02:42 +01:00
Ghazi Triki
ec29839034 Add new reportErrorsInUI to config.xml 2018-06-07 18:49:32 +01:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Ghazi Triki
024016f527 Added a new option to xml.config to enable/disable clearing recording markers. 2018-05-31 14:16:47 +01:00
Richard Alam
b3b9411587
Merge pull request #5575 from ritzalam/shorten-reconn-timer 
- shorten timer to wait in case other red5 conn disconnect. Need to …
 2018-05-23 13:00:02 -04:00
Richard Alam
17f228fba9 - make reconnect wait timer configurable. This timer waits for a period of time in case other connections 
disconnects before initiating reconnection. Default is 2 seconds.
 2018-05-23 08:13:34 -07:00
Richard Alam
414498d0d2 - allow to configure using config.xml that region is default choice for JWS screenshare 2018-05-22 07:51:14 -07:00
Chad Pilkey
f2025b658b temporarily disable uploading on Win FF60+ 2018-05-19 18:16:42 -07:00
Chad Pilkey
8fc80492b6 redesign of screenshare select with win10 chrome warning 2018-05-16 20:01:34 -07:00
Anton Georgiev
292e9a8f02
Merge pull request #5505 from prlanzarin/fix-ss-distortion 
Fixed screenshare resolution limit
 2018-05-10 09:28:06 -04:00
prlanzarin
060e8abf32 Fixed screenshare resolution limit 2018-05-09 23:38:20 +00:00
Fred Dixon
42750408d3
Merge pull request #5504 from capilkey/update-ss-selectwindow 
Updates to WebRTC screenshare in Flash
 2018-05-09 18:55:55 -04:00
Chad Pilkey
04f4fc8eb9 remove last remnants of verto from the Flash client 2018-05-09 14:07:44 -07:00
prlanzarin
9d26a83514 Removed application support for chrome screensharing 
Also reverted the track resolution to the screen res. The WebRTC getSettings is buggy for chrome <= 65
 2018-05-09 16:39:59 +00:00
prlanzarin
1a16e5a0b1 Fixed screenshare resolutions to preserve aspect ratio 2018-05-09 14:21:03 +00:00
prlanzarin
5375eb2836 Removed uneeded dispose func and updated flash kurento-extension with listen only hooks 2018-05-07 17:44:18 +00:00
prlanzarin
14f74fb223 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-05-07 17:43:42 +00:00
Richard Alam
49ce5f58f6 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 10:28:38 -07:00
Richard Alam
d0fe175220 - organize client logs better 2018-05-04 08:48:32 -07:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients 
Also updated SFUs package-lock
 2018-05-03 13:57:03 +00:00
Richard Alam
8c123fcd8e
Merge pull request #5440 from ritzalam/improve-client-logging 
Improve client logging
 2018-05-01 13:39:15 -04:00
Richard Alam
e1e0f8b9b4 - change client log format 2018-05-01 10:34:27 -07:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
Fred Dixon
92968d2e6d
Merge pull request #5415 from capilkey/screenshare-type-chooser 
Add a selection popup for screenshare publish type
 2018-04-26 15:00:16 -04:00
Chad Pilkey
cb74bf51ad add a selection popup for screenshare publish type 2018-04-26 09:52:19 -07:00
Anton Georgiev
9c82f1486b
Merge pull request #5402 from prlanzarin/screenshare-opt2 
HTML5 Screenshare improvements
 2018-04-25 21:08:47 -04:00
Fred Dixon
59aba69c7c Bump the copyright date 2018-04-25 19:13:44 -05:00
prlanzarin
5059ccdce6 Merge remote-tracking branch 'upstream/v2.0.x-release' into screenshare-opt2 2018-04-25 16:57:02 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Richard Alam
e3f1405746 - re-route messages 2018-04-24 12:53:36 -07:00
Richard Alam
bea20eafcb - try to wire up message bus 2018-04-23 15:49:07 -07:00
Richard Alam
e08680987d - use one common bus 2018-04-20 20:28:27 -07:00
Richard Alam
97056da519 - try to use flash to go through vertx 2018-04-20 14:13:31 -07:00
Ghazi Triki
722decd85f Remove remnant verto screensharing and use kurento instead. 2018-04-19 22:45:22 +01:00
prlanzarin
1f057bb267 Improved Chrome WebRTC screenshare constraints 2018-04-17 15:23:25 +00:00
Richard Alam
0f1081a449 - set up actors 2018-04-12 19:17:26 -07:00
prlanzarin
0429c2032f Removed uneeded audio negotiation from screenshare viewers 2018-04-12 18:25:51 +00:00
Richard Alam
5440bdd1a5 - setup wss in haproxy 2018-03-28 12:31:19 -07:00
Richard Alam
54fcaf70ef - send message through vertx 2018-03-27 17:40:31 -07:00
Richard Alam
b1a56ac285 - add vertx lib 2018-03-25 18:27:57 -07:00
Anton Georgiev
77dd01b715
Merge pull request #5228 from MaximKhlobystov/flash-load-without-html5-fix 
[HTML5 Client] Hide client type option when already detected. Vol. 2.
 2018-03-14 17:18:52 -04:00
Anton Georgiev
c52ce83ab4 set max height and width for screenshare to 1080 x 1920 2018-03-09 13:35:37 -05:00
Anton Georgiev
8e0f57c941 linting of kurento-extension.js 2018-03-07 16:23:40 -05:00
Maxim Khlobystov
6a1b70c552 Handling the case when we need to load Flash client and HTML5 client is not installed. 2018-03-07 15:31:01 -05:00
Maxim Khlobystov
cc582eb586 Getting back the code for hiding the client type screen if the type is already detected. 2018-03-07 15:28:20 -05:00
Anton Georgiev
fab5ea6bd7 revert pr 5181 2018-03-05 10:56:42 -05:00
Anton Georgiev
ebfa7214bf revert pr 5181 2018-03-05 10:49:08 -05:00
Anton Georgiev
9219852a95
Merge pull request #5172 from prlanzarin/webrtc-screenshare-fix 
Fixing WebRTC screensharing ICE processing (#4932) and limiting Firefox screensharing choices
 2018-02-28 16:39:01 -05:00
Maxim Khlobystov
5decf88456 Hiding the screen with client options (Flash/HTML5) when it is already detected which one to show. 2018-02-28 11:13:35 -05:00
prlanzarin
ba5f295624 Limited Firefox WebRTC screenshare options to screen only 2018-02-26 18:42:53 +00:00
Anton Georgiev
417acf4d9d
Merge pull request #5125 from prlanzarin/screenshare-fps-ext-prompt 
Limited screensharing FPS to 5-10, resolution to screen size and fixed chrome extension prompt
 2018-02-12 10:39:48 -05:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size 
Also fixes the extension prompt for chrome users in the HTML5 client
 2018-02-08 22:53:18 +00:00
Anton Georgiev
cf42513f2b redirect Android, iOS to html5 except on Puffin browser 2018-02-06 18:25:44 -05:00
Richard Alam
b91f2abde5 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-02-01 12:50:43 -08:00
Richard Alam
5a5232d43d - put logos into its own directory 2018-02-01 08:47:36 -08:00
Richard Alam
418d2184a4 - add protocol for bwmon and port test 2018-01-30 07:47:29 -08:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.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/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Richard Alam
6ea49e05aa - add protocol for bwmon and port test 2018-01-19 14:30:49 -08:00
Fred Dixon
346d127cf0
Merge pull request #4973 from riadvice/logout-feedback 
Implemented "user rating feedback on logout" feature
 2018-01-16 15:56:49 -05:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Augusto Bennemann
67cb4b073b Error notifications for video and screenshare 2018-01-05 17:16:46 +00:00
Ghazi Triki
cc2f2708e3 Add a new configuration option privateChateEnabled for breakout rooms. 2017-12-29 15:51:35 +01:00
Anton Georgiev
61c12298e2
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu 
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
 2017-12-22 14:43:38 -02:00
Richard Alam
7637cedd4b Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562 - implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml 2017-12-21 10:40:44 -08:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Chad Pilkey
2d72bba4c4 extend timeout before pushing focus to Flash 2017-12-15 17:34:59 -05:00
Ghazi Triki
d8cbbfe682 Created new layouts for presentations : 2x1, 2x2, 3x3 2017-12-11 21:51:57 +01:00
Richard Alam
dda21b4a5e
Merge pull request #4793 from capilkey/disabled-moderator-unmute 
Fix meeting mute and disable unmute of others
 2017-12-11 11:00:41 -05:00
Chad Pilkey
860fd2a5df fix meeting mute and disable unmute of others 2017-12-11 00:00:32 -05:00
Richard Alam
715a0177fd Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-08 11:26:09 -08:00
prlanzarin
b7c4115ba3 Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00:00
Ghazi Triki
8a7f31f502 Improve bigbluebutton-client/resources/prod/BigBlueButton CSS styles for "altFlash" div. 2017-11-25 18:33:30 +01:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path 
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
 2017-11-24 18:59:40 +00:00
Ghazi Triki
de500c3dbd Add a new button to display pending guests. 2017-11-23 22:30:05 +01:00
Ghazi Triki
04f46b9eb5 Correctly send MDIWindowEvent.CLOSE event to ChatEventMapDelegate when a public chat window is closed. 2017-11-20 18:28:46 +01:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import 
Added chrome extension ID to HTML5 screenshare call
 2017-11-17 18:55:59 +00:00
Ghazi Triki
7124d8b12f Show group chat in options tab. 2017-11-15 21:51:46 +01:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
Anton Georgiev
e387c824c4 make guest-wait url relative to avoid issues with http/https 2017-11-09 15:44:38 -05:00
prlanzarin
ddb2902834 Small refactoring on kurento-extension 
Proper HTML5 screenshare viewer handling

Changed Firefox screensharing constraints to pick windows and limited max resolution to HD
 2017-11-06 14:27:12 +00:00
Richard Alam
54d5eb1101 Merge branch 'external-swf-modules' of https://github.com/riadvice/bigbluebutton into riadvice-external-swf-modules 2017-11-05 13:53:18 -08:00
Chad Pilkey
6fcf97eaf6
Merge pull request #4629 from capilkey/drop-mic-on-call-end 
Attempt to release mic when not needed for webrtc
 2017-11-03 14:54:19 -04:00
Chad Pilkey
04f268a259
Merge pull request #4627 from capilkey/drop-mic-on-call-end 
Release the saved WebRTC microphone when call ends
 2017-11-03 12:49:17 -04:00
Chad Pilkey
22c160008e attempt to release mic when not needed for webrtc 2017-11-03 12:47:26 -04:00
Ghazi Triki
7b99ac1f06 Improve origin URL setting by adding it to flashvars instead of of calling js from flash client. 2017-11-03 16:19:57 +01:00
Ghazi Triki
e1e162b38f Take into consideration more CDN assets for the Flex client: 
- Added new option `localesDirectory` to language tag.
- Added `localesConfig` to language tag, removed domain guessing and make `locale.xml` external.
- Change the application initialisation order: load config.xml, then locale, then add MainApplicationShell to BigBlueButtonMainContainer if all is correctly processed.
- Added a new event LocaleChangeEvent.LOCALE_INIT.
- Added `videoProfilesConfig` property to VideoconfModule configuration.
- Fix skin name condition in SkinningService.
- Added new Options class: LayoutModuleOptions.
 2017-11-03 10:43:15 +01:00
Richard Alam
e665f2ac6e
Merge pull request #4616 from ritzalam/implement-multi-chat 
- setup polling of guest while waiting for approval from moderator
 2017-10-31 15:55:21 -04:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Chad Pilkey
db44e24b9d
Merge pull request #4609 from capilkey/load-swf-cdn 
Allow loading SWFs from a CDN
 2017-10-31 13:46:07 -04:00
Chad Pilkey
052eed88d0 allow loading SWFs from a CDN 2017-10-30 17:28:32 -04:00
Richard Alam
0036b5734d - create guest lobby html page 2017-10-30 14:21:09 -07:00
Richard Alam
e313647655 - fix presentation window name for sample multi pod layout 2017-10-30 12:08:56 -07:00