Merge branch 'master' into usermanagement

Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
This commit is contained in:
Benjamin Ebling
2014-06-04 15:49:02 +02:00
850 changed files with 145963 additions and 28296 deletions
@@ -21,8 +21,8 @@ ssh $USER@$SERVER "rm -rf $REPO_HOME/sailing"
echo "Uploading local repository to $REPO_HOME/sailing"
scp -r ../../com.sap.sailing.targetplatform.base/gen/p2 $USER@$SERVER:$REPO_HOME/sailing
ecoh "Making readable for everyone..."
ssh $USER@SERVER "chmod -R a+r $REPO_HOME/sailing/*"
echo "Making readable for everyone..."
ssh $USER@$SERVER "chmod -R a+r $REPO_HOME/sailing/*"
echo "Remote files now available:"
ssh $USER@$SERVER "ls -lah $REPO_HOME/sailing"