BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Sebastian 2010-07-05 13:01:14 -04:00
commit 5788d28b53
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bbb-voice-conference/config/app_konference/app_konference-10.04-32.so
View File

Binary file not shown.

1
bigbluebutton-client/.actionScriptProperties
View File

@ -43,3 +43,4 @@
</modules> </modules>
<buildCSSFiles/> <buildCSSFiles/>
</actionScriptProperties> </actionScriptProperties>

1
bigbluebutton-client/.flexProperties
View File

@ -1,2 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/> <flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
View File

@ -149,7 +149,7 @@
this.x = this.parent.width - this.width; this.x = this.parent.width - this.width;
} else { } else {
// Move window so that it won't overlap with Participant's window. // Move window so that it won't overlap with Participant's window.
this.x = DEFAULT_X_POSITION; this.x = ((Capabilities.screenResolutionX / 20) * 3) + 10;
} }
} }

21
bigbluebutton-config/bin/bbb-conf
View File

@ -137,6 +137,7 @@ need_root() {
usage() { usage() {
echo "BigBlueButton Configuration Utility - Version 0.70" echo "BigBlueButton Configuration Utility - Version 0.70"
echo "http://code.google.com/p/bigbluebutton/wiki/BBBConf"
echo echo
echo "$0 [options]" echo "$0 [options]"
echo echo
@ -159,10 +160,9 @@ usage() {
if [ "$(is_vm)" ]; then if [ "$(is_vm)" ]; then
echo "Development:" echo "Development:"
echo " --setup-samba Setup samba share for development (VM only)" echo " --setup-samba Setup samba share for development (VM only)"
echo " --checkout Checkout BigBlueButton from github " echo " --checkout <repo> Checkout from github or passed in repository"
echo " --setup-dev [client|web|apps] Setup development environment " echo " --setup-dev [client|web|apps] Setup development environment "
echo " --reset-dev Reset environment back to using packages" echo " --reset-dev Reset environment back to using packages"
echo " --trunk Checkout trunk instead of last release"
fi fi
echo echo
} }
@ -236,11 +236,6 @@ fi
# Parse the parameters # Parse the parameters
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
if [ "$1" = "-h" -o "$1" = "-help" -o "$1" = "?" -o "$1" = "--help" ]; then
usage
exit 1
fi
if [ "$1" = "-check" -o "$1" = "--check" -o "$1" = "-c" ]; then if [ "$1" = "-check" -o "$1" = "--check" -o "$1" = "-c" ]; then
CHECK=1 CHECK=1
shift shift
@ -303,7 +298,11 @@ while [ $# -gt 0 ]; do
if [ "$1" = "--checkout" -o "$1" = "-checkout" ]; then if [ "$1" = "--checkout" -o "$1" = "-checkout" ]; then
echo "# Request to checkout BigBlueButton" echo "# Request to checkout BigBlueButton"
CHECKOUT="1" if [ $# -lt 2 ]; then
CHECKOUT="git://github.com/bigbluebutton/bigbluebutton.git"
else
CHECKOUT="${2}"
fi
shift; shift shift; shift
continue continue
fi fi
@ -464,13 +463,13 @@ if [ $CHECKOUT ]; then
cd ~/dev/source cd ~/dev/source
echo "# " echo "# "
echo "# Checking out READ-ONLY code from github." echo "# Checking out BigBlueButton."
echo "# " echo "# "
echo "# " echo "# "
git clone git://github.com/bigbluebutton/bigbluebutton.git git clone $CHECKOUT
echo "# " echo "# "
echo "# " echo "# "
echo "# Checked out READ-ONLY code from github. " echo "# Checked out BigBlueButton. "
echo "# " echo "# "
echo " You can now run 'bbb-conf --setup-dev [client|web|apps]' to setup dev environment " echo " You can now run 'bbb-conf --setup-dev [client|web|apps]' to setup dev environment "
echo "# " echo "# "