Commit Graph

6910 Commits

Author SHA1 Message Date
Richard Alam
78ea46ae35 Merge branch 'upgrade-to-red5-1.0.2-M1' into merge-with-upgrade-red5-branch 2014-04-18 15:58:53 -07:00
Richard Alam
6544017d51 Merge pull request #317 from gugat/issue1746
delete old raw dir from published recordings
2014-04-14 21:37:42 -04:00
Gustavo Salazar
7d291abcfd delete old raw dir from published recordings 2014-04-14 15:14:14 -07:00
Richard Alam
7328d21099 - remote log dependency 2014-04-14 12:55:21 -07:00
Richard Alam
7970495c58 - try to fix why BBB apps isn't starting 2014-04-14 10:44:25 -07:00
Richard Alam
e7448cf9c4 Merge pull request #315 from gugat/fix-sanity
set absolute path to ffmpeg
2014-04-07 15:13:04 -04:00
Gustavo Salazar
4989b195f4 set absolute path to ffmpeg 2014-04-07 12:14:47 -07:00
Richard Alam
e709ff4fbd - build with red5 1.0.2-M1 2014-04-07 17:31:49 +00:00
Richard Alam
28e99fe05f - fix compile issue 2014-04-05 09:37:53 -07:00
Richard Alam
17868b5dba - try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues 2014-04-05 09:22:01 -07:00
Richard Alam
00974ecaae - send proper name when recording chat 2014-04-04 20:42:29 +00:00
Richard Alam
cdffdf4062 - fix typo 2014-04-04 20:41:58 +00:00
Richard Alam
16b9935ce3 - setup collecting of incoming and outgoing messages 2014-04-04 19:12:08 +00:00
Richard Alam
0714d25c4a Merge pull request #314 from gugat/flash-error-2038
Flash error 2038
2014-04-04 15:11:36 -04:00
Gustavo Salazar
3f469a2884 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton 2014-04-04 12:17:09 -07:00
Gustavo Salazar
1d647470b7 Skip flash error 2038 2014-04-04 12:15:13 -07:00
Richard Alam
bafedc0c07 - enable recording when there is only 1 user in fs 2014-04-04 15:28:30 +00:00
Richard Alam
f8d8079f59 - make sure to record the EndAndKickAllEvent 2014-04-04 14:51:14 +00:00
Richard Alam
460dfb52bf - modify scripts so we can run it manually 2014-04-03 20:23:49 +00:00
Richard Alam
00ef6c0998 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-04-02 22:12:47 +00:00
Richard Alam
3956daf327 - playing around with api in coffee 2014-04-02 22:11:59 +00:00
Fred Dixon
11b0d0eca7 Bumped footer message in chat to say 0.9.0-dev 2014-04-02 21:35:40 +00:00
Fred Dixon
636793d651 Fix build for bigbluebutton-lti 2014-04-02 21:31:52 +00:00
Richard Alam
7e0af3e042 - check if meeting has been forciblyEnded and don't let the user join if it is 2014-04-02 20:01:29 +00:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Richard Alam
090cb4115b - fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow 2014-04-02 16:17:24 +00:00
Richard Alam
1a9857d493 - start/stop FS recording when first user joins and last user leaves the voice conference 2014-04-01 20:10:26 +00:00
Richard Alam
aeb15546e9 - send start/stop recording to FS 2014-04-01 18:18:47 +00:00
Gustavo Salazar
ff96b6a97a absolute path to ffmpeg and ffprobe. 2014-03-31 18:13:52 -05:00
firstuser
e36170f2a0 - update build to gradle 1.10 2014-03-29 13:39:03 -07:00
Fred Dixon
6424af41dc Algin calls in bbb-conf to bbb-record-core init.d script 2014-03-29 18:46:16 +00:00
Jesus Federico
1191e8f406 Merge pull request #313 from jfederico/merge-polling-with-master
Merge polling with master
2014-03-28 17:32:12 -04:00
Jesus Federico
fd3bac4b31 Merge branch 'master' into merge-polling-with-master 2014-03-28 17:25:47 -04:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Richard Alam
0e1945118f - fix toolbar icon display when user leaves voice conf using webrtc 2014-03-28 15:05:38 +00:00
Richard Alam
d007fecd9f - leave voice conference when logging out even if the browser hasn't fully redirected away from the client yet 2014-03-27 19:36:02 +00:00
Richard Alam
323ffe19d7 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-03-27 15:24:03 +00:00
Richard Alam
bddd6f747d i - fix issue where user cannot leave voice conference when clicking on headset icon 2014-03-27 15:23:28 +00:00
Fred Dixon
9678069647 Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master 2014-03-26 23:53:20 +00:00
Fred Dixon
332824a42c Fixes so rap-worker.rb executes 2014-03-26 23:52:59 +00:00
Richard Alam
7e528c6890 - don't connect using flash when we want webrtc 2014-03-26 20:40:37 +00:00
Jesus Federico
ace2371a8f Grails updated to 2.3.6 2014-03-26 15:45:05 -04:00
Richard Alam
cc624dfa5e - fix race condition where we hangup the chotest and join the conference at the same time.
We should stop echo test then join voice conference.
2014-03-26 19:00:39 +00:00
Richard Alam
963468d729 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-26 16:58:13 +00:00
Richard Alam
1904af29d7 Merge branch 'master' into merge-polling-with-master 2014-03-26 16:57:54 +00:00
Richard Alam
5fb8dee4cd - hide mic settings when user has joined the voice conference 2014-03-26 16:56:38 +00:00
Richard Alam
9a001ed324 - close mic settings when user has joined voice conference 2014-03-25 21:33:58 +00:00
Richard Alam
4a495e0f6a - start stop echo test 2014-03-25 21:22:24 +00:00
Richard Alam
e065b4a63b connect to echo test app 2014-03-25 20:05:33 +00:00
Richard Alam
cd552664bc - continue implementing joining voice conf using flash 2014-03-25 17:16:42 +00:00