BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,572 Commits 13 Branches 260 Tags 1.1 GiB
14327a1edf
Commit Graph

210 Commits

Author SHA1 Message Date
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
fd652e84e0 - some dev scripts to build bbb-voice and bbb-video 2018-06-11 08:31:41 -07: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
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Richard Alam
0bdd491f2e - send video start/stop message to akka-apps instead of having the flash send them as the message 
might not reach the server because the connection disconnected.
 2018-05-11 08:45:22 -07:00
Richard Alam
d740e36435 - add client connId to client logs so we can correlate client conn logs with red5 side conn logs 2018-04-25 16:00:06 -07:00
Richard Alam
95f8ea059f - upgrade video to red5 mar 18, 2018 2018-04-11 11:39:22 -07:00
Richard Alam
a5b1c2f0d5 - track webcam streams to handle start/stop cams and chapter breaks 2018-02-13 12:42:24 -08:00
Richard Alam
1354b065be Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master 2018-01-29 12:36:41 -08:00
Richard Alam
2a784bdb67 - rollback jar dependencies for bbb-voice 2018-01-24 14:10:39 -08:00
Richard Alam
3bf2662aba - start adding check for bbb-voice 2018-01-24 12:53:31 -08:00
Richard Alam
1e60930bc5 - track port test connection and exclude from validating with akka-apps 2018-01-24 08:16:00 -08:00
Richard Alam
7e1f539165 - manage connection 2018-01-23 14:20:49 -08:00
Richard Alam
e56086234c - start tracking port test connections 2018-01-22 14:35:53 -08:00
Richard Alam
aef4030750 - authorize connection using token 2018-01-22 14:05:48 -08:00
Richard Alam
672d3b5ef7 - try to prevent connecting to bbb-video with authz 2018-01-22 11:54:57 -08:00
Richard Alam
17cec753a0 - add more logging to trace why start webcam event doesn't appear in events.xml 2017-12-13 20:24:41 -08:00
Richard Alam
c2d0406d4c - Check auth token when connecting to bbb-video. Close connection if not authorized. 2017-11-02 10:33:28 -07:00
Richard Alam
4e8f2abbb3 - pass token on video connect 2017-11-01 14:55:48 -07:00
Richard Alam
ed88dba7e5 - record start/stop webcam events into redis 2017-10-30 11:45:52 -07:00
Richard Alam
1b045a04d2 - fix video recording of events 2017-10-29 16:12:46 -07:00
Richard Alam
852353a491 - stop, start voice recording when chapter break occurs 2017-10-25 11:18:27 -07:00
Richard Alam
f2709d7294 - stop start recording of webcam 2017-10-24 18:31:09 -07:00
Richard Alam
7d08504bc8 - trace received message 2017-10-24 14:48:06 -07:00
Richard Alam
5b51d137a4 - fix NPE 2017-10-24 14:37:37 -07:00
Richard Alam
3ef3ff9682 - wire up pubsub message handler 2017-10-24 14:14:51 -07:00
Richard Alam
fa6a1be518 - received redis pubsub messsages 2017-10-24 12:20:14 -07:00
Richard Alam
6f10140eb3 - setup redis pubsub receiver for bbb-video 2017-10-23 14:37:47 -07:00
Richard Alam
e918a2b1bf - start implementing segment recording 2017-10-20 14:47:36 -07:00
Richard Alam
fd8f38eacb - start implementing meeting manager and broadcast stream 2017-10-20 14:31:19 -07:00
Richard Alam
9d98a550c5 - formatting changes 2017-10-20 14:30:26 -07:00
Richard Alam
ae80469351 - upgrade to red5 oct-10-2017 2017-10-10 11:19:41 -07:00
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00: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
Richard Alam
4eafa2d014 - update dependency to bbb-commons-message 0.19-SNAPSHOT 2017-07-10 14:36:59 -07: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
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
Pedro Beschorner Marin
7fa799eb16 Included transcode rotate events in bbb-video 2017-05-19 19:59:33 +00:00
Richard Alam
8723fca30c - update version of bbb-commons-message 2017-05-04 13:48:39 -07:00
Felipe Cecagno
b76f99c957 Merge branch 'fix-180-video-rotation' of github.com:pedrobmarin/bigbluebutton into mconf 2017-04-22 20:24:50 -03:00
Pedro Beschorner Marin
e01554a667 Fixing 180 video rotation 2017-04-17 20:43:20 +00:00
Felipe Cecagno
abad8289d1 do not generate start and stop webcam events for h263 streams (needed to play video on iOS) 2017-04-16 17:13:35 -03: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
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
ca539f9098 Do not record webcam if meeting is not recorded 
Currently, we record webcams even if the meeting is not being recorded. We add
 an indicator in the webcam stream name ("-recorded") to trigger bbb-video in
 red5 to record the webcam stream.
 2017-02-27 19:54:21 +00:00
Richard Alam
8f6213b77d - upgrade to latest red5 2016-11-22 20:45:58 +00:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00