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

1185 Commits

Author SHA1 Message Date
Chad Pilkey
d3f09252f8 bump chat default size from 12 to 14 2017-08-18 16:01:25 -04:00
Chad Pilkey
ac030e6254 fix meeting and client locking 2017-08-11 20:53:09 -04:00
Ghazi Triki
3df8e6fb3c Add missing enableGuestUI option to UsersModule configuration. 2017-08-10 15:46:38 +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
Chad Pilkey
6be3863f33 hide some unrequired UI elements 2017-07-24 15:42:29 -04: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
Richard Alam
407fdaad3d Merge pull request #4090 from perroned/verto-stun-turn 
Enable stun/turn use within verto
 2017-07-15 09:18:41 -04:00
perroned
9315143a5e Sets showButton to true 2017-07-14 15:14:00 -04: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
Ghazi Triki
1ca350c6c8 Updated data grid and icons for users item renderers. 2017-07-12 17:37:05 +01: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
perroned
f92be502cc Moves constraints to initialization 2017-07-07 17:01:33 -04:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html 
Generic addresses for Kurento on the screenshare server
 2017-07-05 17:58:19 +00:00
Ghazi Triki
8bf90835ec Replace main png logo by a swf logo. 2017-07-05 15:56:53 +01:00
Ghazi Triki
fff2ad8f50 Updated layout.xml by adding gaps between windows. 2017-07-05 15:18:43 +01:00
prlanzarin
89fe4df880 Merge branch '1.1-transcode' of https://github.com/pedrobmarin/bigbluebutton into 1.1-transcode-screenshare-merge 2017-07-04 16:27:14 +00:00
Ghazi Triki
5cb30b7bc3 Activated old button icons from legacy default theme. 2017-07-04 15:26:56 +01:00
prlanzarin
5b8109a566 Added support for Firefox WebRTC screensharing with KMS 
Fixed Chrome getUserMedia constraints

Added client-side draft methods for HTML5 screenshare
 2017-07-03 19:13:00 +00:00
Ghazi Triki
d5e0098a52 Added new theme named V2Theme with a brand fresh new style. 2017-07-03 18:36:53 +01:00
prlanzarin
251cd67df4 Added first prototype of Kurento WebRTC screenshare client module 2017-06-13 20:18:21 +00:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	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/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Ghazi Triki
cd8f09170f Add showWebRTCMOS option. 2017-06-05 13:28:24 +01:00
Ghazi Triki
fd2535236a Read configuration options for version 2 using the new Options class. 2017-05-24 12:19:25 +01:00
Ghazi Triki
ef306c748f Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into faster-options-reading 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/LayoutOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentOptions.as
#	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/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2017-05-23 22:59:09 +01:00
Ghazi Triki
7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x 
# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb
 2017-05-22 17:35:24 +01:00
Fred Dixon
237c6f8fbc Update BigBlueButton.html 2017-05-20 12:33:42 -04:00
Ghazi Triki
b59e64b21f Additional improvements to the configuration parsing. 2017-05-19 10:39:12 +01:00
Ghazi Triki
96835619ab Remove obsolete configuration options. 2017-05-19 00:20:25 +01:00
Chad Pilkey
7a46382e86 Merge pull request #3946 from riadvice/fix-presenter-share-only 
Delete the option "presenterShareOnly" in favor of lock settings
 2017-05-18 12:29:21 -04:00
Ghazi Triki
43d05ffa0b Remove presenterShareOnly option and all its implementation. 2017-05-17 14:30:54 +01:00
perroned
a7c2542c0a Overwrites popup function 2017-05-15 12:16:30 -04:00
Ghazi Triki
a7f6d8483c Use the correct Arabic locale for the flash client. 2017-05-10 11:04:33 +01:00
Stephen Dame
6fff8c0a8a flash blue to white screen 2017-05-08 14:09:47 -07:00
Richard Alam
44e3fb8a07 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-05-08 08:51:31 -07:00
Fred Dixon
26a62bd398 Merge pull request #3907 from kepstin/webrtc-stats 
Update webrtc stats bridge for modern Chrome/Firefox APIs
 2017-05-05 14:21:48 -04:00
Calvin Walton
75c680832c Update webrtc stats bridge for modern Chrome/Firefox APIs 
Switch to the promise-based getStats, and use the standardized
property names where available, with fallback to handle Chrome,
which hasn't fully switched yet.

The stats now only track the outgoing audio stream, as a way to
indicate quality, since the user can't hear themselves. This
might be revisited later; it would require tracking the stats
separately for incoming vs. outgoing and e.g. returning whichever
is worse.
 2017-05-05 11:22:38 -04:00
Richard Alam
23e6dea35b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-05-04 14:39:02 -07:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
perroned
1d7ba676da Update verto libs 2017-05-03 14:12:42 +00:00
perroned
43636d26ad Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-verto-libs 2017-05-02 22:15:36 +00:00
perroned
4b6c95f1c9 Adds chrome tabs to extension 2017-05-02 15:01:05 +00:00
Richard Alam
c733f4eafc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-04-27 14:52:47 -07:00
Chad Pilkey
3970f17455 force Flash on Edge 15+, fixes #3812 2017-04-26 17:13:52 -04:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Ghazi Triki
92554f8b3e Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Ubuntu
8445c49f92 - add dimension of screen share 2017-03-29 15:58:43 +00:00
Ubuntu
e6796bf3ea Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:25:47 +00:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
Chad Pilkey
4515c08654 changes to shortcut keys so they all work in IE 2017-03-22 19:53:12 -04:00
perroned
cb124961a2 Connect to /verto endpoint 2017-03-22 22:20:15 +00:00
Ubuntu
a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-22 20:37:41 +00:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
perroned
47c6e3fe69 Puts back resolution values into screen constraints 2017-03-21 17:14:36 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
perroned
dd6f869059 Fixes exceptions and jnlp download issue 2017-03-13 21:20:13 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Chad Pilkey
0235dd5adb fix plus and minus shortcut modifier in key table 2017-03-08 19:26:02 -05:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00:00
Fred Dixon
c0c58b5507 Update BigBlueButton.html 
Modified "You need Flash Installed" message.
 2017-03-04 10:02:39 -05:00
Anton Georgiev
ad59c80853 adjust ExternalApiCalls for multiple recovered cams 2017-03-01 13:56:10 -05:00
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +00:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
perroned
2d04f057cc Cleans up html5 screenshare 2017-02-22 20:31:09 +00:00
perroned
de1a91950e Restructure constraints 2017-02-21 21:07:42 +00:00
Fred Dixon
47767ae9cf Minor edit to config.xml to setup defaults for logging 2017-02-08 19:14:28 -06:00
perroned
0c64b0e0dc Removes comments from config xml template 2017-02-08 21:27:53 +00:00
Richard Alam
cc9e0c9151 Merge pull request #3618 from riadvice/detect-https-in-bbb_webrtc_bridge_sip.js 
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
 2017-02-07 14:45:04 -05:00
Dan A. Perrone
37cce892fc fixes issue of sending empty video 2017-02-07 10:18:52 -05:00
Anton Georgiev
ad35758cb9 initialize html5StunTurn properly - complication from PR 3628 2017-02-03 13:57:29 -05:00
Anton Georgiev
22bb2a8200 fix bug preventing stun/turn call 2017-02-03 11:25:04 -05:00
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00:00
Ghazi Triki
0d6acd27b4 Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws 2017-01-31 19:31:27 +01:00
Felipe Cecagno
3d075f81a5 Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2017-01-25 00:01:05 -02:00
Anton Georgiev
e55705b043 recover redirect to html5 client on android device 2017-01-24 15:34:52 -05:00
Chad Pilkey
0ea6387b19 remove screenshare webrtc options from config.xml because they aren't fully implemented 2017-01-23 14:32:58 -05:00
Felipe Cecagno
c878b13e8b new year 2017! 2017-01-12 14:48:07 -02:00
Chad Pilkey
c4bcd9de2a hack for Chrome 56+ to try and work around transparent Flash blocking 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2017-01-12 14:47:27 -02:00
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05:00
Felipe Cecagno
1d1b7107e4 update signed java applet 2016-12-04 11:16:32 -02:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
perroned
fc995d25bf Adds conference command support 2016-12-01 17:00:15 +00:00
Richard Alam
224114c83d Merge pull request #3424 from riadvice/logout-on-stop-recording 
New option to logout user when he stops the recording
 2016-11-22 13:40:41 -05:00
Felipe Cecagno
a05a7ca642 fix url for shared notes on config.xml 2016-11-20 21:21:26 -02:00
Fred Dixon
a6deb821a4 Update config.xml.template 2016-11-04 15:41:01 -04:00
Ghazi Triki
ea9460b1bf Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms. 2016-10-31 10:12:22 +01:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Ghazi Triki
6103151edd New option to logout user when he stops the recording. 2016-10-24 12:15:34 +01:00
perroned
256cf66f23 Added config xml parameter 2016-10-21 15:24:40 +00:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
perroned
ad0c4d8c34 Use screen resolution for screenshare 2016-10-06 16:16:07 +00:00
perroned
bc91fbecfd Properly handle Chrome dialog 2016-10-05 19:57:09 +00:00
perroned
a194ddbba4 Help dialogs for ext install 2016-10-05 14:35:35 +00:00
perroned
53f0512589 Removes iframe reference to outside domain 2016-09-20 13:43:06 +00:00
perroned
1392d2e902 Removes iframe reference to outside domain 2016-09-20 13:38:41 +00:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
perroned
7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-html5/imports/startup/server/EventQueue.js
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-09-14 19:30:07 +00:00
perroned
6f69732bb4 Renames useWebRTCIfAvailable to tryWebRTCFirst 2016-09-13 14:34:35 +00:00
Fred Dixon
0aac39cff3 Added more explanation for Mac FireFox in screenshare-help.html 2016-08-30 17:01:30 -04:00
Fred Dixon
738fc00ddf Updated help text for launching screen sharing 2016-08-29 11:02:30 -04:00
Chad Pilkey
a3854068e0 remove autoStart and autoFullscreen options from the Screenshare module 2016-08-23 16:13:20 -07:00
Richard Alam
8130662890 Merge pull request #3316 from antobinary/nginx-logging2 
Logging to server (to be handled by nginx)
 2016-08-23 17:09:16 -04:00
Anton Georgiev
6ba64ed749 add new field to config.xml 2016-08-23 19:48:25 +00:00
Chad Pilkey
480ced5cc4 add version number to css.swf 2016-08-23 12:38:37 -07:00
perroned
820ee786f0 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-22 09:21:54 -07:00
Fred Dixon
dcc0af953d Updates to help file for new screen sharing 2016-08-21 16:17:32 -04:00
perroned
63953b1384 Hooking up viewing from html5 2016-08-19 14:07:47 +00:00
perroned
ec03a3e3db Fixes device issues with sharing screen 2016-08-18 15:40:33 +00:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
perroned
fc8438f61a move some data into verto JS 2016-08-05 18:42:02 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
Chad Pilkey
1c6efa1945 add cc window to other layouts so it doesn't show up when not wanted 2016-08-04 10:30:17 -07:00
Richard Alam
366c6673f6 Screenshare help page 
Help page with link to videos.
 2016-08-03 21:20:05 +00:00
Richard Alam
f1e2040062 Screenshare help page 
Add placeholder for screenshare help page.
 2016-08-03 20:33:56 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
9111a445ad Removes function, removes console error 2016-07-25 21:00:41 +00:00
perroned
2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-07-22 19:20:00 +00:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00:00
Chad Pilkey
5dd6d86b36 upgrade sip.js to 0.7.5 2016-07-07 21:06:11 +00:00
perroned
b505f460dc Begins adding webrtc deskshare to screenshare 2016-06-28 17:15:36 +00:00
Pedro Beschorner Marin
415393ca30 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2016-06-27 13:10:58 +00:00
Felipe Cecagno
775d8a7d3b download presentations configurable by an attribute in the config.xml 2016-06-24 12:31:14 -03:00
perroned
8877c30aa0 Clean up 2016-06-20 19:39:20 +00:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
 2016-06-20 16:11:04 +00:00
perroned
0ab36e8ec3 Cleaning up 2016-06-20 15:59:48 +00:00
perroned
570b41ab81 Use one verto handle 2016-06-20 15:05:39 +00:00
perroned
13ffa169c2 Cleaning up 2016-06-17 20:36:45 +00:00
Pedro Beschorner Marin
17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 
Conflicts:
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-config/web/default.pdf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2016-06-17 18:00:51 +00:00
perroned
6a48605773 Verto manager screen share 2016-06-17 17:50:04 +00:00
perroned
86035fce39 Adds verto manager window functions 2016-06-17 17:47:24 +00:00
perroned
7ae2da4e9d Grabs screen params from chrome/ff 2016-06-17 15:43:03 +00:00
perroned
a95ed82293 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-06-15 20:07:42 +00:00
perroned
1f6e40596f Working on screenshare for chrome/ff 2016-06-14 16:13:49 +00:00
perroned
e9fd499851 Readding verto sharing 2016-06-14 16:11:04 +00:00
perroned
88cc944609 Rewrites verto extension 2016-06-08 20:07:43 +00:00
perroned
a3e2a3a54a Upgrade verto libs 2016-06-08 20:07:07 +00:00
Felipe Cecagno
23492e76ca define toolbar color and alphas through config.xml 2016-06-03 13:52:14 -03:00
Ghazi Triki
3d21b291cb Added new option "enableBreakoutRooms" to users module. 2016-06-02 21:05:18 +01:00
perroned
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00:00
perroned
4977950081 Fixes crash when starting video view 2016-05-30 17:21:30 +00:00
Fred Dixon
cd1779afbe Remove XML block for older deskshare module 2016-05-29 21:58:00 -04:00
Fred Dixon
098cb8e560 Commented out Deskshare in config.xml.template 2016-05-28 16:03:37 -04:00
perroned
2145cc0d1e Stops fucntion that broke video viewing on html5 2016-05-26 20:25:27 +00:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Anton Georgiev
0861e192b9 disable webrtc deskshare for now 2016-05-19 17:59:58 +00:00
Anton Georgiev
4981344062 Merge branch 'mod-verto-1' of github.com:perroned/bigbluebutton into merge-webrtc-ds 
Conflicts:
	bigbluebutton-html5/app/client/globals_audio.coffee
	bigbluebutton-html5/app/client/verto.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/server.coffee
 2016-05-19 15:48:40 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Richard Alam
6233105f69 Merge pull request #3150 from perroned/join-components-with-skeleton 
Adds deskshare video to html5 client
 2016-05-27 21:45:53 -04:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.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/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
388ff0705c Moves verto credentials to config.xml 2016-04-01 14:47:40 -05:00
Richard Alam
7d5c9d63e4 Upgrade to Java 8 
Upgrade to Java 8 and merge screenshare feature.

Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2016-03-21 20:19:48 +00:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
Felipe Cecagno
e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-03-02 01:19:09 -03:00
Felipe Cecagno
66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2016-03-02 00:19:30 -03:00
perroned
a819652916 updating callbacks 2016-02-24 11:49:48 -08:00
perroned
5652417e02 normalize all callbacks passed when starting ds 2016-02-23 15:18:10 -08:00
perroned
65650d3484 normalizing callbacks 2016-02-23 15:16:39 -08:00
perroned
57ab378961 library comments 2016-02-23 14:06:45 -08:00
perroned
f486b24041 Firefox error handling 2016-02-23 14:06:24 -08:00
perroned
a42c9765f7 Firefox error handler when DS fails 2016-02-23 14:01:49 -08:00
perroned
581e7b0e02 Add extension key entry to config xml 2016-02-22 07:34:17 -08:00
perroned
ad6a0402d1 adding history of addition to library 2016-02-22 06:34:19 -08:00
perroned
ed7fbcf0e3 divide up code paths between chrome/ff and html5/flash 2016-02-17 12:33:49 -08:00
perroned
05488dda5d Firefox deskshare presenter 2016-02-17 12:30:24 -08:00
perroned
eb15680b4a documentation for modification to FSRTC lib with call types 2016-02-17 12:27:27 -08:00
perroned
1894d7e1e2 documentation for modification to FSRTC lib 2016-02-17 12:26:46 -08:00
perroned
a91eab1e05 temp fix for deskshare on Firefox 2016-02-17 08:17:10 -08:00
perroned
dedd00727a extra check for extension 2016-02-16 08:33:27 -08:00
perroned
d5057dbb74 Callback for html5/flash fix 2016-02-16 08:32:30 -08:00
Richard Alam
dd37445b7d - screenshare client 2016-02-10 19:43:38 +00:00
Richard Alam
6eb7c446e1 Merge pull request #3007 from capilkey/1.0-access-bugfix1 
Four minor accessibility fixes
 2016-02-08 17:22:36 -05:00
Chad Pilkey
d5db28ac3c removed unused functions from JS 2016-02-08 13:07:08 -08:00
Chad Pilkey
c40087ffac fixed some html labelling in the client 2016-02-08 13:06:34 -08:00
Fred Dixon
f1d322f3e2 Added Low Latency (h.263) profile 2016-02-08 12:11:48 -05:00
perroned
4c98822201 Add WebRTC option to config XML 2016-02-04 11:14:55 -08:00
Richard Alam
dbf02ba36e - desktop sharing doesn't stop when the applet is tunneling. Catch the exception and stop the applet. 2016-02-04 19:13:47 +00:00
Felipe Cecagno
dd928bf189 update copyright message to 2016 2016-02-03 15:23:37 -02:00
Felipe Cecagno
39af3980f9 update java applet with new certificate signed by RNP 2016-02-03 13:34:18 -02:00
Fred Dixon
3dbfd83747 Load get_flash_player.gif from BigBlueButton server 2016-01-30 11:32:25 -05:00
Fred Dixon
ef79077e09 Fixed undefined error when loading BigBlueButton.html 2016-01-30 11:31:35 -05:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
perroned
7d8610b68c hangup debug information 2016-01-19 10:33:05 -08:00
perroned
e983919b88 configuring server credentials and fixed Flash gUM issues 2016-01-19 08:22:17 -08:00
perroned
77a6dd586d Support for html5 and Flash 2016-01-18 07:29:42 -08:00
perroned
2216bf89a0 adding verto libraries 2016-01-18 07:24:13 -08:00
Chad Pilkey
008d59c85d Merge pull request #2947 from mconf/webrtc-reconnect 
WebRTC reconnect
 2016-01-13 15:25:33 -05:00
perroned
279f40a4c2 Updated Flash clients deskshare libs 2016-01-13 12:03:52 -08:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Chad Pilkey
3e9d6348ff update the video module to conform for accessibility 2016-01-08 15:00:23 -08:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Felipe Cecagno
d1cfabdfa5 new deskshare applet signed by rnp 2016-01-04 15:49:53 -02:00
Felipe Cecagno
019cfa6cfb Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
 2016-01-04 15:14:27 -02:00
Felipe Cecagno
8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
 2015-12-30 18:35:13 -02:00
Felipe Cecagno
a340103fad make the shared notes default font size configurable by config.xml 2015-12-22 17:45:16 -02:00
Anton Georgiev
105fb2495d avoid issues oberved in verto 2015-12-11 16:45:36 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Anton Georgiev
97bcb025b6 add webrtc deskshare module; comment out old deskshare module 2015-12-09 20:36:37 +00:00
Felipe Cecagno
f49d758582 change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout 2015-12-08 17:43:14 -02:00
Felipe Cecagno
5d1534df8c Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js
 2015-12-08 17:42:43 -02:00
Felipe Cecagno
66379edc1d fix deskshare on java 1.9 2015-12-08 17:38:05 -02:00
Anton Georgiev
7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 
Conflicts:
	record-and-playback/core/scripts/bigbluebutton.yml
 2015-11-30 21:44:04 +00:00
Anton Georgiev
8ced2a3207 remove hardcoded defaults. Grab on the go 2015-11-30 21:20:56 +00:00
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-video/.classpath
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/SharedNotesModule.mxml
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.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/model/users/events/ChangeMyRole.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
	bigbluebutton-config/bigbluebutton-release
	bigbluebutton-config/bin/bbb-conf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
 2015-11-25 15:58:36 +00:00
Chad Pilkey
98c88558f2 trying a different approach to respond to changes to the text box 2015-11-13 15:30:32 -08:00
Felipe Cecagno
6e5729fc67 created toolbarVisibleByDefault and showToolbarButton attributes for shared notes window 2015-11-10 11:17:23 -02:00
Chad Pilkey
4dcc4a4c6e updated sipjs to match master 2015-11-06 08:47:41 -08:00
Chad Pilkey
42236569a5 update sip.js to include a ice candidate timeout 2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Felipe Cecagno
83ae244485 Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3 2015-10-19 11:49:36 -02:00
Richard Alam
25cd1701c6 Merge pull request #2844 from ritzalam/update-deskshare-0.9.0-jar 
- update 0.9 deskshare signed jar with new cert
 2015-10-16 16:20:51 -04:00
Richard Alam
3afe92a5b7 - update 0.9 deskshare signed jar with new cert 2015-10-16 20:18:45 +00:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
Chad Pilkey
9f277583c2 the client responds to the first two caption messages 2015-10-15 15:42:01 -07:00