Commit Graph

5643 Commits

Author SHA1 Message Date
Richard Alam
2f30fd4485 - check if user can connect using RTMP or RTMPT 2013-04-17 21:47:12 +00:00
Richard Alam
18bacaa632 - fix NPE when sending incorrect checksum to getDefaultConfigXML call 2013-04-17 18:43:10 +00:00
Richard Alam
8986c4b0ef Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-04-17 18:37:35 +00:00
Richard Alam
344e87a548 - try to figure out best way to test for cam 2013-04-17 18:36:43 +00:00
Fred Dixon
d61f83248c Further simplified default layout.xml by commenting out the Users layout as it appears the same as default layout 2013-04-17 11:17:49 -07:00
Gustavo Salazar
b4f5501832 fix values for layouts in demo12 2013-04-17 12:43:30 -05:00
Fred Dixon
6083c28418 Remove red from cancel button in presentation upload dialog 2013-04-16 19:42:23 -07:00
Fred Dixon
b58a7a0028 Simplified the choices in layout.xml 2013-04-16 19:35:11 -07:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Markos Calderon
581b9caf27 UI changes to muteme button 2013-04-16 20:09:10 -05:00
Markos Calderon
7100c53543 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-16 18:38:36 -05:00
Markos Calderon
c29e1b9aab added UI changes to layout menu and network monitor 2013-04-16 18:38:11 -05:00
Gustavo Salazar
c5d17a80f8 improve form in demo12 2013-04-16 16:40:25 -05:00
Richard Alam
dc69530bf0 - start add cam check 2013-04-16 21:17:00 +00:00
Markos Calderon
7ca3a26c54 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-16 16:00:47 -05:00
Markos Calderon
e918777ef2 UI modifications when user is talking 2013-04-16 16:00:11 -05:00
Richard Alam
9913cba842 - don't make upload button fix sized to allow changing icon through CSS 2013-04-16 20:51:04 +00:00
Richard Alam
8457c2b30d - don't show switch presenter button if you are already presenter 2013-04-16 20:50:34 +00:00
Richard Alam
420e7fe339 Merge branch 'implement-pre-flight'
Conflicts:
	bigbluebutton-client/build.xml
2013-04-16 17:43:24 +00:00
Richard Alam
13923dbf39 Merge branch 'make-polling-start-up' 2013-04-16 15:45:06 +00:00
Richard Alam
3481b80230 - check for microphone 2013-04-16 15:42:31 +00:00
Richard Alam
9252447a92 - make polling module run with latest master 2013-04-15 20:48:10 +00:00
Fred Dixon
47a4d72c13 Removed second HRule for the Audio Settings Dialog 2013-04-13 09:02:28 -07:00
Fred Dixon
cd4939d44a Modified bbb.playback.css to hide border lines 2013-04-12 21:56:28 -04:00
Fred Dixon
bdf3663bc4 Added link to BigBlueButton Google+ page on index.html 2013-04-12 21:00:26 -04:00
Fred Dixon
5d524be6b7 sudo bbb-conf --check now calls bbb-record --check to check for errors in recordings 2013-04-12 12:20:52 -04:00
Gustavo Salazar
f3350e18c0 show length of recordings processed with 'presentation' scripts in demo10 2013-04-12 10:15:00 -05:00
Gustavo Salazar
9c590006c8 load jquery before jquery-ui 2013-04-12 10:13:06 -05:00
Richard Alam
34d3285a04 Merge pull request #124 from SenecaCDOT-BigBlueButton/imp-muteme-button
New muteme button
2013-04-12 08:08:25 -07:00
Richard Alam
0f98d922bf - add some checks for java 2013-04-12 10:08:48 +00:00
Richard Alam
e5887fe1b8 - start adding checks 2013-04-12 09:36:21 +00:00
Richard Alam
89c73c9951 - start implementing standalone pre-flight check page 2013-04-12 07:47:07 +00:00
Richard Alam
753a79546d - provide JS api to eject user 2013-04-11 20:56:02 +00:00
Chad Pilkey
d5e955c2a8 Merge remote branch 'upstream/master' into imp-muteme-button 2013-04-11 10:48:07 -07:00
Chad Pilkey
120fea2fd0 removed old button and new one works 2013-04-11 10:10:32 -07:00
Fred Dixon
fa791b0a90 Updated comments in /etc/cron.daily/bigbluebutton 2013-04-11 08:14:48 -04:00
Fred Dixon
ac79e858bf updated copyright on index.html to 2013 2013-04-10 23:16:04 -04:00
Fred Dixon
071fb54b80 Added check to bbb-conf --check for ensuring ffmpeg is installed 2013-04-10 22:38:54 -04:00
Fred Dixon
777c3972d2 Updated bbb-conf to remove --setup-dev scripts. The script now refers developers to the wiki for detailed steps. 2013-04-10 22:07:22 -04:00
Richard Alam
4b5afe742c - disable looback audio when opening mic settings 2013-04-10 22:04:29 +00:00
Richard Alam
ca37dd17ff - fix issue where the avatar window opens up when a user sharing webcam is ejected from the meeting 2013-04-10 21:20:02 +00:00
Richard Alam
68b522803d - Add button to test microphone 2013-04-10 21:02:04 +00:00
Richard Alam
8b98130d46 - turn on loopback when testing mic 2013-04-10 20:10:56 +00:00
Richard Alam
3fef459a19 - simplify audio settings 2013-04-10 18:45:08 +00:00
Richard Alam
3dd09235e2 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-04-10 14:15:43 +00:00
Richard Alam
2cd99552b6 - cleanup 2013-04-10 14:15:22 +00:00
Fred Dixon
a8046aac78 Updates to bbb-conf to detect older version of bbb-freeswitch package 2013-04-09 20:42:38 -04:00
Richard Alam
6ef3a8d51a - fix issue where we can't match voice user with web user when user's name has a dash 2013-04-09 17:42:32 +00:00
Gustavo Salazar
5b4c7307af more conditions to rearchive 2013-04-08 15:26:37 -05:00
Chad Pilkey
0617d847ea switched strings to locale strings, unlocked is now only shown to moderators 2013-04-08 13:26:12 -07:00