BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,358 Commits 13 Branches 260 Tags 1.1 GiB
5440bdd1a5
Commit Graph

1079 Commits

Author SHA1 Message Date
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
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
Richard Alam
974c1d7780 - sample default layou for chat 2017-10-30 10:00:31 -07:00
Richard Alam
528c401110 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-29 14:30:18 -07:00
Chad Pilkey
f471bb7380 add proper window identification to PresentationWindows 2017-10-29 15:53:54 -04:00
Richard Alam
fb90502a92 - sample layout.xml 2017-10-28 17:31:22 -07:00
Chad Pilkey
47b98e0def chat windows now open in order and the first is included in the layouts 2017-10-28 14:41:15 -04:00
Ghazi Triki
d1772901f9 Remove locale version check feature. 2017-10-20 22:03:33 +01:00