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

16272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pedro Beschorner Marin
d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala
 2017-06-08 18:57:37 +00:00
Pedro Beschorner Marin
55d12b331b Fixed wrong package path 2017-06-08 18:31:30 +00:00
Pedro Beschorner Marin
40aeabb41c Cleaning up some unused transcode akka-apps methods 2017-06-08 15:53:49 +00:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
 2017-06-07 18:18:54 -03:00
Pedro Beschorner Marin
719ef1377a Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.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
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	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/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-config/bin/bbb-conf
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/core/scripts/rap-worker.rb
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2017-06-07 19:31:15 +00:00
Pedro Beschorner Marin
6f40494a31 Merge remote-tracking branch 'mconf' into mconf-akka-transcoding 2017-06-07 16:50:41 +00:00
Pedro Beschorner Marin
8ecef2f1f2 Included a redis pub service in deskshare 2017-06-06 20:47:33 +00:00
Pedro Beschorner Marin
fd4931f25b Refactored common-messages in bbb-video redis publisher 2017-06-06 20:46:09 +00:00
Pedro Beschorner Marin
397c373148 Moved webcam h263 conversion to akka-transcode 2017-06-06 18:29:15 +00:00
Pedro Beschorner Marin
9a9810a4c9 Rotating videos in akka-bbb-transcode 2017-06-06 13:20:14 +00:00
Felipe Cecagno
1827362f8a Merge pull request #406 from alexandrekreis/mconf 
Storing meeting duration
 2017-06-02 17:37:48 -03:00
alexandre
cbd01875b9 Storing meeting duration 
We were getting the duration with a Popcorn temporary instance. This was causing a slowly increase on the cpu usage, which could compromise the performance of long recordings.
 2017-06-02 15:45:09 -03:00
Felipe Cecagno
6dd0641de2 disable padding on body to handle the case when the playback is embedded in a third party app with a header 2017-05-31 20:37:57 -03:00
alexandre
fc3c6134a7 Reverting shapes drawing refactoring 
There are some cases in which annotations does not appear. It needs more testing.
 2017-05-30 14:51:20 -03:00
alexandre
d7b38ced81 Removing deskshare intervals in the slide aspect calculations 
Deskshare has it own functions to set its aspect. We were causing wrong annotations positioning as well as wrong slide resizing.
 2017-05-30 14:39:55 -03:00
Chad Pilkey
89918858b5 force Flash on Edge 15+, fixes #3812 2017-05-24 23:03:20 -03:00
Stephen Dame
d386223da3 flash blue to white screen 2017-05-24 22:52:50 -03:00
Anton Georgiev
6df3eb2afe Merge pull request #3940 from JaeeunCho/hidden_closedCaption 
HTML5 - fixed closed-caption display
 2017-05-24 15:57:58 -04:00
Felipe Cecagno
e45fd8794a Merge branch 'mconf' of github.com:alexandrekreis/bigbluebutton into mconf 2017-05-24 16:54:36 -03:00
Felipe Cecagno
13e045320f fix logic to avoid warnings regarding Java on updated Firefox 2017-05-24 14:56:32 -03:00
Felipe Cecagno
ae71ac936e Merge branch 'firefox-52-java' of github.com:pedrobmarin/bigbluebutton into mconf 2017-05-24 14:14:34 -03:00
alexandrekreis
e49df73d6d Merge pull request #404 from alexandrekreis/merge-split-video-mconf 
function is_video_valid returns true if video is valid
 2017-05-23 17:05:23 -03:00
alexandre
c75a19d990 function is_video_valid returns true if video is valid 2017-05-23 17:02:26 -03:00
Fred Dixon
3749e513ce Merge pull request #3963 from ffdixon/fix-ip-detection 
Improved the detection if IP addresses in bbb-conf
 2017-05-23 11:29:37 -04:00
Fred Dixon
66aa72e1e7 Improved the detection if IP addresses in bbb-conf 2017-05-23 10:29:16 -05:00
Fred Dixon
8096c2e5a2 Merge pull request #3958 from ffdixon/1.1-0-release 
Bump version number to 1.1.0
 2017-05-22 11:25:06 -04:00
Fred Dixon
eabfd7e862 Bump version number to 1.1.0 2017-05-22 10:23:55 -05:00
Fred Dixon
237c6f8fbc Update BigBlueButton.html 2017-05-20 12:33:42 -04:00
Pedro Beschorner Marin
7fa799eb16 Included transcode rotate events in bbb-video 2017-05-19 19:59:33 +00:00
Jesus Federico
4c2df2e529 Merge pull request #3955 from jfederico/bbb-web 
bbb-web: Fixed issue in getRecordings not responding the meetingID co…
 2017-05-19 11:21:34 -04:00
jfederico
a4b0cb7436 bbb-web: Fixed issue in getRecordings not responding the meetingID correctly 2017-05-19 15:11:08 +00:00
Anton Georgiev
bb75ca73e1 Merge pull request #3953 from antobinary/adjust-3934 
Revisit pull request #3934
 2017-05-19 10:22:55 -04:00
alexandre
155cc4edad Video sync mechanism refactoring 
- Created function "seySync( )" which sets the sync logic. Basically, we sync all medias when pausing the master video. We pause the master video when any video receives a waiting event, or when the master video is seeked. If necessary, we resume playing after the sync.

- Refactored when 'media-ready' event is fired.  We fire this event only when the medias receive a 'canplayall' event.
 2017-05-18 18:05:49 -03:00
JaeeunCho
607a3f4e5d HTML5 - put the order at media class 2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -07:00
Pedro Beschorner Marin
481a05233b Included video rotation and h263 convertion in akka-transcode 2017-05-18 19:47:06 +00:00
JaeeunCho
bba5170f43 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-18 12:42:45 -07: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
Anton Georgiev
409a471ab5 bring catch clause on the same line as closing curly brace 2017-05-18 10:52:59 -04:00
Mario Gasparoni
89e6aaba35 Add bbb-transcode-akka to bigbluebutton-config 2017-05-18 14:19:24 +00:00
JaeeunCho
8b6f8e857c HTML5 - removed unused media query 2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
Anton Georgiev
71d4e8b0e0 catch Meteor error on userLeaving 2017-05-17 15:17:27 -04:00
Pedro Beschorner Marin
6966bfc5af Added VideoApp in akka-apps to manage the video transcoding 2017-05-17 18:01:25 +00:00
Mario Gasparoni
3a8d915927 Index transcoder per meeting 
Basically we now allow two or more instances of the same transcoder's ID, since they are in different meetings
 2017-05-17 17:45:07 +00:00
Mario Gasparoni
9a3fc66687 Stop Meeting Transcoders 
Stop any remaining transcoder used by the meeting. Useful for mediaSource transcoders.

Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
 2017-05-17 17:43:30 +00:00
Mario Gasparoni
34fd6b0aad Using DESTINATION_IP_ADDRESS instead of SIP_HOST in akka-transcode 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
 2017-05-17 17:37:51 +00:00
Mario Gasparoni
16698f7489 Introducing bbb-transcode-akka 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	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/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/core/apps/VoiceApp.scala
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java
	akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
	bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
	bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
 2017-05-17 15:54:44 +00:00