Peter Siegmund c6e0d9b579 Merge branch 'master' into android_apps ...

Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/res/values/strings.xml
	mobile/com.sap.sailing.android.tracking.app/pom.xml
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/racelog/impl/RaceLogEventsCallback.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java

2015-01-13 15:04:22 +01:00

..

configuration

Merge branch 'master' into android_apps

2015-01-13 15:04:22 +01:00

.gitignore

…

env.sh

updated "REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl" in wiki description for replica start-up

2014-11-25 09:38:24 +01:00

http2udpmirror

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

http2udpmirror_axel

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

http2udpmirror_axel_proxy

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

importdeclination

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

refreshInstance.sh

evaluate the combined env.sh in /etc/init.d/sailing before deciding and launching the httpd server

2014-11-16 10:52:49 +01:00

start

adjusted start script so it uses the Luna / Equinox launcher

2014-10-08 12:59:13 +02:00

startOnAStick

…

status

Added mongodb name to status

2014-09-25 09:41:49 +02:00

stop

Fixed support for mac os x systems

2013-12-12 09:50:03 +01:00

swisstiminglistener

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

swisstiminglistenerLog.properties

…

udpmirror

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

udpmirrorLog.properties

…

udpmirrorOnAStick

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00

updateIPToBoat2

replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu

2014-07-16 11:31:14 +02:00