7259 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anton Georgiev	727ca898c6	user_joined_event: when received, the user is added to the list of users	2014-03-31 15:43:34 +00: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
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
Anton Georgiev	83bfd513b7	substituted some of the hard-coded values with values from the msg object	2014-03-24 19:03:34 +00:00
Anton Georgiev	edf31e2724	whiteboad_draw_event message sent and the html5 client handles it. have to modify the channel the message is sent to. in the html5 client performed a check to see if header.name is whiteboard_draw_event and if yes overwrote the channel to bigbluebutton:bridge	2014-03-24 16:14:41 +00: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
Anton Georgiev	65cd93ec1a	created a WhiteboardEventRedisPublisher. When I draw in the flash client I get a simple json message in the console of the html5 client	2014-03-21 20:21:20 +00:00
Anton Georgiev	0b5330e0d1	added a chat event listener. Now a simple chat json injected into pubsub will be displayed in the red5 console and will go through the listener "ChatMessageListener.java"	2014-03-21 17:59:54 +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