BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,037 Commits 13 Branches 260 Tags 1.1 GiB
7d10ac1a98
Commit Graph

712 Commits

Author SHA1 Message Date
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
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
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
58f60efe40 Improve opera browser detection. 2017-10-12 18:21:20 -03:00
Ghazi Triki
2c7d910d83 Display native locale name in LanguageSelector menu. 2017-10-12 13:27:55 -03:00
Anton Georgiev
1326cfb42b navigate to html5 login if no Flash on system 2017-10-09 15:12:55 -04:00
Ghazi Triki
b934a3bffa Added a new layout named "Presentation + Users" 2017-09-19 19:36:16 +01:00
Chad Pilkey
b4f2fad93b Merge pull request #4401 from capilkey/block-edge-webrtc 
Use bowser for MS Edge detection
 2017-09-14 14:18:32 -04:00
Chad Pilkey
e1da68a3ab use bowser for msedge detection 2017-09-14 14:14:43 -04:00
Ghazi Triki
8d75b4e399 [Experimental] - Added "rtlEnabled" feature as option to change layout direction for RTL languages. 2017-09-14 14:37:38 +01:00
Chad Pilkey
06377b6a25 hide edge webrtc because it's incompatible 2017-09-13 17:46:52 -04:00
Chad Pilkey
73d394bf31 updated sipjs to the latest release 0.7.8 2017-09-11 20:49:04 -04:00
Ghazi Triki
6a6d2f3e38 Improved shared notes UI. 2017-09-07 15:37:27 +01:00
Chad Pilkey
f8481e9557 Merge pull request #4344 from antobinary/fullscreen 
Switch from flash based fullscreen to html5 api based
 2017-08-31 17:02:13 -04:00
Anton Georgiev
25fa5f5445 expose fullscreen state to flash to control button icon 2017-08-31 16:44:47 -04:00
Anton Georgiev
ed3bfae6e9 switch from flash based fullscreen to html5 api based 2017-08-30 17:18:59 -04:00
Ghazi Triki
446304ac50 Display all rows in breakout rooms data grid. 2017-08-30 14:40:15 +01:00
Ghazi Triki
30f7b302a2 Increse users window height in default layout. 2017-08-28 10:04:22 +01:00
Fred Dixon
d825aa44d5 Merge pull request #4295 from pedrobmarin/fullscreen-fix 
Flash client's chrome fullscreen fix
 2017-08-22 16:20:25 -04:00
Pedro Beschorner Marin
5a388961d7 Included allowfullscreeninteractive param when loading the swf file in chrome 2017-08-22 19:36:02 +00:00
Ghazi Triki
571899bbc8 Updated layout.xml with larger central area. 2017-08-22 11:54:09 +01:00
Oleksandr Zhurbenko
db1b8c3ecb Added a check for Windows 2017-08-04 16:01:43 -07:00
Oleksandr Zhurbenko
02a1855650 Added a check to detect a 32 bit version of Firefox only 2017-08-04 12:46:34 -07:00
Oleksandr Zhurbenko
dd671737f7 Fixes hanging Flash on tab switch in Firefox 55-56 2017-08-04 12:18:38 -07: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
Ghazi Triki
528acab82e Updated toolbar logo to make aligned with meeting name label. 2017-07-25 14:10:44 +01:00
Richard Alam
37c744b01b Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-07-20 10:25:36 -07:00
prlanzarin
5ebc45dabf Removed duplicated adapter.js import in BigBlueButton.html 2017-07-19 14:17:24 +00:00
Ghazi Triki
186417fb6f Merge branch 'master-v2' into 2x-client-theme 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	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/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-07-18 18:38:46 +01: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