Commit Graph

6029 Commits

Author SHA1 Message Date
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
Chad Pilkey
1039dc5f59 muteMeBtn hides when locked, added text to the muteMeBtn 2013-04-08 11:27:27 -07:00
Gustavo Salazar
d1e1f6e497 find meetingId instead of description 2013-04-08 11:15:46 -05:00
Gustavo Salazar
c6d4bd8a03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-04-05 17:37:39 -05:00
Gustavo Salazar
0a74b3a722 map external meeting id with internal meeting id and vice versa 2013-04-05 17:37:05 -05:00
Gustavo Salazar
48a81ab593 make description of recording optional in bbb-record --watch 2013-04-05 15:57:34 -05:00
Richard Alam
ab24e89722 Merge pull request #119 from SenecaCDOT-BigBlueButton/switch-lock-image
added 20x20 images so images in the users window don't shift
2013-04-05 13:30:42 -07:00
Chad Pilkey
e68213b53a added 20x20 images so images in the users window don't shift 2013-04-05 13:25:21 -07:00
Gustavo Salazar
0166939205 use the 'Crop Box' of pdf page 2013-04-05 14:00:13 -05:00
Jesus Federico
7d7cb30c2e Merge pull request #118 from jfederico/master
Example of how dynamicConfigXML can be used
2013-04-05 09:18:00 -07:00
Jesus Federico
bc8c116077 Updated config.xml and removed hardcoded IP address 2013-04-05 12:07:00 -04:00
Jesus Federico
36ed2f6537 Made error messages consistent on setConfigXML 2013-04-05 00:07:41 -04:00
Jesus Federico
549600aab2 Adjusted bbb-api.jsp to support POST with different contentTypes 2013-04-05 00:06:50 -04:00
Markos Calderon
652076d952 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-04 15:50:26 -05:00
Markos Calderon
0db6cfedb6 make gloweffect configurable 2013-04-04 15:50:12 -05:00
Gustavo Salazar
7fe05d349f sanity check for webcam and deskshare 2013-04-04 15:08:49 -05:00
Richard Alam
3f27928cd6 Merge pull request #117 from SenecaCDOT-BigBlueButton/re-implement-locking
more misc fixes
2013-04-04 12:33:38 -07:00
Chad Pilkey
66e7f0bb98 more misc fixes 2013-04-04 12:04:05 -07:00