BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,712 Commits 13 Branches 260 Tags 1.1 GiB
70bf69182a
Commit Graph

195 Commits

Author SHA1 Message Date
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	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-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Travis Kemen
6c9238b105 A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6 2015-12-29 19:30:48 -06:00
Ghazi Triki
fad585051b akka-bbb-fsesl/build.sbt uses bbb-common-message 0.0.16-SNAPSHOT 2015-11-03 21:51:21 +01: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
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Anton Georgiev
8b58671948 cleaning up 2015-09-10 15:24:08 +00:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Richard Alam
0e2e79fce8 - change redis pool config 
- reconnect to redis if connection to subscribe disconnected
 2015-08-23 04:56:30 -04:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.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/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Richard Alam
a3318e5f90 - send keep alive message 2015-08-19 14:33:46 +00:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Anton Georgiev
4db2ebb86e flag for ds started; cleaning up logs 2015-08-11 20:30:07 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
aa6191402c - change logging level as it was logging too much 2015-08-05 16:28:16 +00:00
Richard Alam
087c07a6a8 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into add-num-responders 2015-07-13 19:20:31 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Anton Georgiev
9f5783c0b4 use real meetingId+timestamp broadcast path 2015-07-08 14:35:51 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Anton Georgiev
8de66fd448 ds rtmp displays in Flash client 2015-07-07 19:17:27 +00:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Richard Alam
6d7b93e6a4 - upgrade bbb-common-message version 2015-07-02 19:23:36 +00:00
Anton Georgiev
7192079977 send to BBB-Apps vh, vw, samplerate, fps, channels 2015-06-30 18:50:29 +00:00
Anton Georgiev
d7682f97b8 auto start/stop rtmp broadcast 2015-06-29 14:27:35 +00:00
Anton Georgiev
09e907d2ba auto start/stop video rec based on meeting isRecorded 2015-06-26 19:54:07 +00:00
Anton Georgiev
922ab7cc04 distinguish between rtmp broadcast and file record 2015-06-25 14:28:23 +00:00
Anton Georgiev
0e362e9762 FS deskshare serverside cont'd 2015-06-23 19:45:36 +00:00
Richard Alam
acb8a8c89a - implement sending of polling messages thru redis 2015-06-22 21:27:44 +00:00
Anton Georgiev
8b161e8217 record command; record messages 2015-06-19 20:38:54 +00:00
Richard Alam
35ebeb3bce - try to fix log location 2015-06-19 14:24:29 +00:00
Anton Georgiev
bdb56d4884 FS video share/view messages from fs to bbb-apps 2015-06-18 22:07:15 +00:00
Richard Alam
468217200f - fix welcome message bug 
- fix private chat bug
 - start implementing polling
 2015-06-16 19:18:23 +00:00
Richard Alam
a734f5c64e - upgrade version and fix description 2015-06-10 20:45:29 +00:00
Richard Alam
36b9dc0104 - use bbb-common-message 2015-06-10 19:11:31 +00:00
Richard Alam
b178f7f077 - make bbb-fsesl use common messages 2015-06-10 18:30:31 +00:00
Richard Alam
bc214f3a32 - fix message name 2015-06-10 18:30:05 +00:00
Richard Alam
24b957e9e3 - rename to reflect this is our esl client to FS 2015-06-09 19:03:02 +00:00