BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,101 Commits 13 Branches 260 Tags 1.1 GiB
82a1f96cac
Commit Graph

243 Commits

Author SHA1 Message Date
Fred Dixon
9477de78f3 switched /etc/init.d/freeswitch to /etc/init.d/bbb-freeswitch 2011-05-27 15:54:09 -07:00
Richard Alam
9c6b27fb5f Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2011-03-18 15:43:39 -04:00
Fred Dixon
16873c0683 Fixed #671: Prevent users from entering the demo meeting with empty username 2011-03-16 15:57:42 -04:00
Fred Dixon
2849a4c420 Fixed bug #834 2011-02-28 21:19:23 -05:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Fred Dixon
873103b533 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-01-16 16:39:18 -08:00
Fred Dixon
648a49fdf2 Fixed a bug with incorrect updating of security salt with --setsalt 2011-01-16 16:39:02 -08:00
Richard Alam
6b97c99817 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
 2011-01-11 16:08:12 -05:00
Richard Alam
be02e9adbf - changing to version 0.71a 2011-01-11 13:54:42 -05:00
Fred Dixon
68a31cb15f - Changed the version in index.html to 0.71a 2011-01-10 22:09:07 -05:00
Marco Calderon
d6c8b30e19 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:03:11 +00:00
Fred Dixon
e75e779e04 - Don't check for symbolic link for /etc/nginx/sites-enabled/bigbluebutton if running on the Intalio VM 2010-12-13 21:25:59 -05:00
Fred Dixon
26e0bbfdac - More checks to ensure jetty has started before trying to check if BigBlueButton web is running 2010-12-13 19:25:34 -05:00
Fred Dixon
0ead92fc94 - Modified bbb-conf so it can use jetty and tomcat6 as a servlet engine. 2010-12-12 20:12:22 -05:00
Fred Dixon
87f6b0a869 - Fixed bug #778 2010-12-12 13:31:41 -05:00
Marco Calderon
11167ae29f added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
Richard Alam
312b3f216b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-11-10 09:55:00 -05:00
Fred Dixon
ad04fc4306 - Added code to take only the first IP address from ifconfig (see issue 729) 2010-11-10 07:49:46 -05:00
Fred Dixon
77fcbeeaf3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-11-09 19:21:58 -05:00
Fred Dixon
9632b421e0 - Changed message in bbb-conf from 0.71-Beta to 0.71 2010-11-09 19:21:41 -05:00
Scott Morris
b498ea0569 Fixed <! for the DOCTYPE 2010-11-09 17:34:09 -05:00
Richard Alam
2e7c164f49 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-11-09 17:04:47 -05:00
Scott Morris
4b9f06d711 Fixed DOCTYPE tage 2010-11-09 17:04:43 -05:00
Richard Alam
add6f38872 - adding v0.71 tag to bbb-conf 2010-11-09 16:49:04 -05:00
Scott Morris
5214e1d6d0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-config/web/index.html
 2010-11-09 16:40:53 -05:00
Scott Morris
b142b27010 Updated index.html to remove beta status! 2010-11-09 16:36:06 -05:00
Fred Dixon
6995b745f7 - Updating setting of IP address 2010-11-06 16:41:39 -04:00
Fred Dixon
6516f93d1c - Small formatting change in the Waiting to startup message 2010-11-06 16:35:59 -04:00
Fred Dixon
8416e2410f - Removed printing of sip.server.host on bbb-conf -c as it would cause confusion why it's the only variable with an IP address. Instead, added checks to ensure when FreeSWITCH is running, this variable matches the local IP address 2010-11-06 16:06:17 -04:00
Fred Dixon
fc542997ac - Modified assignment of sip.server.host to be just IP address (not host name) 2010-11-04 21:48:48 -04:00
Fred Dixon
68f5c25a08 - Update bbb-conf to properly set sip.server.host 2010-11-03 21:07:55 -04:00
Fred Dixon
b963201509 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-config/bin/bbb-conf
 2010-11-03 21:06:17 -04:00
Fred Dixon
f9aa471ac1 - Added logic to reset settings for sip.server.host for asterisk or FreeSWITCH 2010-11-03 20:48:04 -04:00
Fred Dixon
13952f70c0 - bbb-conf now changes sip.server.host in /usr/share/red5/webapps/sip/WEB-INF/bigbluebutton-sip.properties when running FreeSWITCH 2010-11-01 13:06:29 -07:00
Fred Dixon
876a7f77d4 - Formatting updates 2010-10-30 20:11:27 -07:00
Fred Dixon
590bebad83 - Minor updates after switching between asterisk and FreeSWITCH 2010-10-30 17:28:27 -07:00
Fred Dixon
d5810f8512 - Ensure calls to nc always have a valide host/IP address (avoid endless loops for checking for ports) 2010-10-30 16:49:42 -07:00
Fred Dixon
df76508322 - Updates after testing switching between app_konference and freeswitch 2010-10-30 16:45:50 -07:00
Fred Dixon
887540daa7 - Updates to bbb-conf to now split out check_configuration and check_state. This allows it to check_configuration before attempting a restart and warn the administrator of any settings that could affect bbb-conf --restart or bbb-conf --clean. 2010-10-30 14:41:21 -07:00
Fred Dixon
3ef3d34dd7 - Print out version of BigBlueButton Server when user types bbb-conf --check 2010-10-24 18:38:07 -07:00
Fred Dixon
d8c1d75924 - Added app_konference-10.04-64.so from Generic Conferencing 2010-10-24 17:05:13 -07:00
Fred Dixon
52024a891b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-10-23 19:07:43 -07:00
Fred Dixon
0f3ae381b7 - Making small changes to test VM 2010-10-23 19:07:34 -07:00
Fred Dixon
90a34ee8c9 - Added more checks for errors when installing either asterisk or FreeSWITCH before BigBlueButton. 2010-10-16 22:45:42 -04:00
Fred Dixon
55ed2eeeec - Detect whether asterisk or freeswitch is installed, but warn if both are present 2010-10-16 21:27:12 -04:00
Fred Dixon
e2750b6419 - Added checks bin bbb-conf to see if bbb-voice-conference or bbb-freeswitch-config are installed 2010-10-16 20:51:49 -04:00
Fred Dixon
7f64ad3c77 updated index.html from 0.71-dev to 0.71-beta 2010-10-15 11:05:18 -04:00
Scott Morris
21848d21af Changed an ambiguous message to be more understadable 2010-10-14 20:14:13 +00:00
Fred Dixon
76fdf8c8b6 - Updated index.html for 0.71-dev testing 2010-10-09 22:10:21 -04:00
Fred Dixon
216713afaa - added a check to ensure the when start_bigbluebutton finishes, BigBlueButton is ready to receive connections 2010-10-09 18:35:15 -04:00