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

6910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
a79e224f4b Merge pull request #309 from gugat/webrtc-bbbconf 
enable / disable webrtc
 2014-03-10 15:19:12 -04:00
Gustavo Salazar
c6c5c4b81f enable / disable webrtc 2014-03-10 14:16:37 -05:00
Richard Alam
4c5739a43c - change path to pdf2swf 2014-03-10 15:14:34 +00:00
Richard Alam
62f89ebe2d - start deskshare properly 2014-03-09 20:23:39 -04:00
Richard Alam
86abffc79b - add timer to check meeting duration 2014-03-09 14:41:24 -04:00
Richard Alam
6ec6553534 - send end meeting message from bbb-web 2014-03-09 00:05:43 -05:00
Fred Dixon
f9018a7625 Merge pull request #308 from kepstin/presentation-200 
Reverse the check for http response code.
 2014-03-05 15:18:08 -05:00
Calvin Walton
7b48cacb59 Reverse the check for http response code. 
There are many codes other than '404' which indicate that the media
file is not present or otherwise unusable. Instead of checking for
a particular failure mode, check for explicit success.

I ran into this on a server that had directory listing disabled, and
returned a 403 (access denied) error on non-existant files.
 2014-03-05 14:42:08 -05:00
Richard Alam
1a5251621d - display poll button if presenter when user joins 2014-03-02 18:16:52 -05:00
Richard Alam
4fd512f158 Merge branch 'master' into merge-polling-with-master 2014-03-02 17:48:42 -05:00
Richard Alam
a418190169 - sync presentation position for latecomer 2014-03-02 16:43:04 -05:00
Richard Alam
a535412629 - fix switching presentation 2014-03-02 15:15:42 -05:00
Richard Alam
db3686bd40 - fix compile error 
- fix url for slides
 2014-03-07 14:58:51 +00:00