BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,256 Commits 13 Branches 260 Tags 1.1 GiB
a3e2a3a54a
Commit Graph

96 Commits

Author SHA1 Message Date
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
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00: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
4d27b460ae - expire redis keys for events that are stored even if meeting is not recorded 2015-09-23 22:31:15 +00:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00
Richard Alam
007a13d0e9 - add more logging to determine who detects the disconnect first 2015-07-13 20:50:38 +00:00
Richard Alam
249c40302d - fix NPE when webcam is closed properly 2015-07-02 19:22:56 +00:00
Richard Alam
96b4700ae0 - fix logging 
- stop the stream only if it hasn't been stopped yet
 2015-07-02 17:11:12 +00:00
Richard Alam
4190ad3aa7 - close stream if no video packet received within a few seconds 2015-07-02 14:41:17 +00:00
Richard Alam
8e504aa2a8 - detect webcam stream start/stop on bbb-video and send corresponding message to bbb-apps. We need 
a way to detect that webcam stream stopped server side because when the client's connection
   to bbb-video is disconnected due to network issue, the notification that the stream stopped
   from the client side can't be sent to the server.
 2015-06-30 17:23:53 +00:00
Richard Alam
18403d03bc - update red5 to bring in fix for connections not cleanedup properly which may be cause OOM Exception 2015-02-11 22:31:23 +00:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Richard Alam
0d44571674 - update to latest red5 with local connection ishared object fix 2015-01-13 18:08:03 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
7936ee3e7c - upgrade to red5 1.0.4 release 2014-12-29 10:37:35 -08:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Richard Alam
0a718c3f38 - upgrade to latest red5 release 2014-08-14 07:19:59 -07:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
20bd95463c - apply https://code.google.com/p/bigbluebutton/issues/detail?id=1734 2014-07-30 12:57:47 -07:00
Richard Alam
97262dfba5 - make recording process work 2014-06-12 12:31:24 -07:00
Richard Alam
e7dcf3c4bf - fix compile issue 2014-05-29 13:55:01 -07:00
Richard Alam
a939588df8 - upgrade to gradle 1.7 
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile

export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin

source ~/.profile
 2013-09-17 18:10:52 +00:00
Richard Alam
2800c4f603 - upgrade to red5 r4643 2013-05-18 21:39:53 +00:00
Richard Alam
42afda8f5c - upgrade to red5 r4641 2013-05-14 18:47:23 +00:00
Richard Alam
67185ee9e5 - upgrade to red5 r4639 2013-05-08 19:16:43 +00:00
Richard Alam
0b902805b0 - seems like it's picking the wrong jar 2013-04-30 15:43:56 +00:00
Richard Alam
75fb9c9a09 - upgrade to red5 r4635 to get fix for RTMPT kepp alive 2013-04-30 15:11:28 +00:00
Richard Alam
607d09e7cb - upgrading to latest red5 with fix to rtmpt 2013-04-28 23:38:54 +00:00
Richard Alam
91176431ca - upgrade to red5 r4360 2013-04-28 20:11:19 +00:00
Richard Alam
dfa65a5d91 - upgrade to red5 r4628 2013-04-27 23:07:28 +00:00
Richard Alam
0b055b1672 - fix commons-pool jar definition 2013-04-26 22:58:24 +00:00
Richard Alam
c06334f24d - upgrade to red5 r4627 2013-04-26 20:59:33 +00:00
Richard Alam
0cb6721147 - upgrade to red5 r4599 2013-03-19 18:27:22 +00:00
Richard Alam
d28a7ecf02 - upgrade to red5 r4597 2013-03-18 18:05:35 +00:00
Richard Alam
02296cf267 - upgrade to red5 r4592 2013-03-11 15:00:48 +00:00
Richard Alam
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +00:00
Richard Alam
601afeaae3 - upgrade red5 to r4580 2013-03-04 18:12:07 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
46a07f4eb6 - build bbb-voice and bbb-video on red5 r4573 2013-02-28 00:33:53 +00:00
Richard Alam
cc859b94f8 Merge branch 'master' into upgrade-to-red5-r4573 2013-02-26 14:48:01 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00