BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,873 Commits 13 Branches 260 Tags 1.1 GiB
323ffe19d7
Commit Graph

6873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Gustavo Salazar
9a2b05a7ee allow username with spaces 2014-03-24 17:18:39 -05:00
Gustavo Salazar
55773f594e allow username with spaces 2014-03-24 16:00:13 -05:00
Fred Dixon
45e03911ae Better matching for webRTC enabled in config.xml 2014-03-23 22:52:39 +00:00
Fred Dixon
3a2318c491 Removed debugging information 2014-03-23 22:35:09 +00:00
Richard Alam
e27c8000f8 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-23 16:05:28 +00:00
Richard Alam
35daebbf86 - don't go through echo test again when user has already done it 2014-03-23 16:02:40 +00:00
Richard Alam
3f66908f4d - reinit mic 2014-03-21 22:08:50 +00:00
Richard Alam
bd0a54e9f1 - continue implementing Flash Mic Settings dialog 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 2014-03-21 21:43:19 +00:00
Richard Alam
ce3432fb1b - disable flash calling for webrtc testing 2014-03-21 14:37:09 +00:00
Richard Alam
0bc45659fc - show elcome message in chat window 2014-03-21 14:20:27 +00:00
Richard Alam
98d851c582 - add new commands 2014-03-20 20:46:46 +00:00
Richard Alam
5bb2a2cb2b - continue implementing join voice using flash 2014-03-20 19:10:09 +00:00
Richard Alam
148e3be430 - start implementing joining voice using flash 2014-03-19 21:34:09 +00:00
Richard Alam
401ac84e49 Merge branch 'master' into merge-polling-with-master 
Conflicts:
	bigbluebutton-config/bin/bbb-conf
 2014-03-19 13:59:03 +00:00
Richard Alam
9998ea3df4 Merge branch 'split-mic-settings-dialog' into merge-polling-with-master 2014-03-18 19:15:43 +00:00
Richard Alam
a08be6298f - implement flow for user to join vonce conf uwing webrtc 2014-03-18 19:14:27 +00:00
Richard Alam
a7f2d17c90 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-03-17 20:06:41 +00:00
Richard Alam
bb5db33eac - implement user joining voice using webrtc 2014-03-17 19:47:45 +00:00
Fred Dixon
44e2255b59 reformatting of commands to enable/disable webRTC support 2014-03-16 19:55:16 +00:00
firstuser
915f9aa3d7 - continue implementing mic settings for webrtc 2014-03-15 18:15:28 -07:00
Fred Dixon
ae5316116e Small change to test build 2014-03-15 23:33:58 +00:00
Richard Alam
61d90933f4 - display different mic setting for ff and chrome 2014-03-14 22:44:53 +00:00
Richard Alam
04a77ddaca - figure out how to display mic permissions for FF and Chrome 2014-03-14 21:06:31 +00:00
Richard Alam
3b4b818841 i - do echo test and then join voice conference using webrtc 2014-03-14 19:21:21 +00:00
Richard Alam
4cc16f1b00 - add bin-debug dir to ignore 2014-03-14 16:03:23 +00:00
Richard Alam
d869dab51e - start implementing echo test and join conference using webrtc 2014-03-14 16:02:54 +00:00
Fred Dixon
f217cbc786 updated release to 0.9.0-dev 2014-03-13 01:19:25 +00:00
Fred Dixon
716452016c Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master 2014-03-13 01:05:22 +00:00
Fred Dixon
7c9ed6b6ef Merged updates to enable/disable webrtc; removed obsolete references to asterisk 2014-03-13 01:04:58 +00:00
Richard Alam
102cd186d7 - hook up whiteboard recorder 2014-03-12 19:43:39 +00:00
Richard Alam
e5eb48a90f - fix recording 2014-03-12 18:37:11 +00:00
Richard Alam
680fa7709a - minot cleanup 2014-03-12 18:36:33 +00:00
Richard Alam
dd0ed0df37 - fix query presentations from JS API 2014-03-12 14:18:14 +00:00
Fred Dixon
658adc13e7 Updates to bbb-conf and bbb-record for 0.9.0 2014-03-12 01:31:56 +00:00
Fred Dixon
ff87e59e5c removed carriage returns from bigbluebutton.properties as it was causing errors with bbb-conf 2014-03-12 01:18:19 +00:00
Richard Alam
d89459f938 - formatting cleanup 2014-03-11 17:58:26 -04:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00