Commit Graph
26945 Commits
Author SHA1 Message Date
Axel Uhl cf3e8ab51c fixing bug 3134: NPE in GetFinishedRacesAction 2015-07-18 15:13:24 +02:00
Axel Uhl 30ad7b10cb Merge branch 'bug3124' into ubilabs--rcapp--master 2015-07-18 15:04:50 +02:00
Axel Uhl 95c453c616 Merge remote-tracking branch 'server/ubilabs--rcapp--master' into ubilabs--rcapp--master 2015-07-18 12:51:52 +02:00
Axel Uhl 1ec486793c Merge branch 'master' into ubilabs--rcapp--master 2015-07-18 12:50:32 +02:00
Axel Uhl 256cb78ef1 Merge branch 'ubilabs--rcapp--bug-3119' into ubilabs--rcapp--master 2015-07-18 12:44:59 +02:00
Axel Uhl b4497e8f9d Merge branch 'master' into tw2015 2015-07-18 11:54:40 +02:00
Axel Uhl ab41d9f175 Merge remote-tracking branch 'server/master' 2015-07-18 11:54:29 +02:00
Axel Uhl 726be9b301 Merge remote-tracking branch 'server/tw2015' into tw2015 2015-07-18 11:53:50 +02:00
Axel Uhl 077178b1f5 Merge remote-tracking branch 'server/master' into tw2015 2015-07-18 11:47:01 +02:00
Axel Uhl 53f710e93b Merge branch 'master' into tw2015 2015-07-18 11:44:05 +02:00
Axel Uhl cbb9d4e8ae fixing bug 3129 by handling null boat class when producing regatta overview entry 2015-07-18 11:42:57 +02:00
Frederik Petersen f394bf3285 Merge branch 'tw2015' of ssh://sapsailing.com/home/trac/git into tw2015 2015-07-18 11:18:21 +02:00
Frederik Petersen af0f30c89b Merge branch 'master' into tw2015 2015-07-18 11:18:09 +02:00
Frederik Petersen 7d951bc1f9 Added two boat class names aliases that tractrac used 2015-07-18 11:17:27 +02:00
Steffen Tobias Wagner 9790337016 added autossh section 2015-07-18 08:48:42 +00:00
Axel Uhl 8ad721095d Merge branch 'master' into tw2015 2015-07-18 10:36:43 +02:00
Axel Uhl 87ca2b60fb added serialVersionUID for SimpleRaceLogIdentifier 2015-07-18 10:36:25 +02:00
Axel Uhl e2333b8f1e Merge branch 'master' into tw2015 2015-07-18 10:27:27 +02:00
Axel Uhl 78506543c1 made SimpleRaceLogIdentifier serializable 2015-07-18 10:20:00 +02:00
Axel Uhl 3193a30d32 Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into tw2015 2015-07-18 10:16:44 +02:00
Axel Uhl 5e5608e52f Merge remote-tracking branch 'server/ubilabs--rcapp--feature--2467-improved-starttimefinder' into ubilabs--rcapp--feature--2467-improved-starttimefinder 2015-07-18 10:15:18 +02:00
Axel Uhl 0205ff3ab8 Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into tw2015 2015-07-18 10:10:52 +02:00
Axel Uhl 15635dd8f8 avoid ArrayIndexOutOfBounds for dependent start time setting when a regatta has only one race 2015-07-18 10:09:57 +02:00
Frederik Petersen 9a3e74ccba More preparation for PolarService Serialization 2015-07-18 00:48:58 +02:00
Axel Uhl e3a4967523 Merge branch 'bug3124' into tw2015 2015-07-17 23:23:12 +02:00
Axel Uhl 5813348521 Merge branch 'bug3124' into tw2015
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java
2015-07-17 23:23:03 +02:00
wagnst f4bb8fab69 Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into bug3124 2015-07-17 23:22:05 +02:00
wagnst 70a421d8ca Merge branch 'ubilabs--rcapp--feature--2467-improved-starttimefinder' into ubilabs--rcapp--bug-3119 2015-07-17 23:21:20 +02:00
wagnst d2ea7543a5 set default dependent races setting to true 2015-07-17 23:20:07 +02:00
Axel Uhl b0261afc15 bug 3124: avoiding endless recursion in case of cyclic start time dependencies by carrying along already constructed RaceStates
keyed by SimpleRaceLogIdentifier
2015-07-17 23:09:16 +02:00
Axel Uhl 1a1134dc9e handle PRESCHEDULED in RaceContext 2015-07-17 22:36:18 +02:00
Axel Uhl cb784b9251 fixed dependent start time listening and null handling and bootstrap in two passes 2015-07-17 22:08:29 +02:00
Axel Uhl 57fc41b020 Merge branch 'master' into ubilabs--rcapp--bug-3119
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
2015-07-17 20:43:30 +02:00
EC2 Server 76a93a64c9 Merge branch 'master' into tw2015 2015-07-17 18:21:37 +00:00
Axel Uhl 1e46ea4fae Merge branch 'master' into ubilabs--rcapp--feature--2467-improved-starttimefinder
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
2015-07-17 19:44:43 +02:00
Frederik Petersen fb15a2bf7c Added replicable registration in polar bundle activator 2015-07-17 19:12:31 +02:00
Frederik Petersen 9e723f876e PolarDataService now implements Replicable 2015-07-17 19:03:05 +02:00
Axel Uhl 498838a605 Merge remote-tracking branch 'server/master' 2015-07-17 18:34:53 +02:00
Frederik Petersen bbc369d007 Preparing polar service for replications
since replicas need to receive initial polars during initialLoad

First step: Make polar miner replicable
2015-07-17 18:28:05 +02:00
fmittag ffc020329a improved the naming of the minimized time slider mark labels. 2015-07-17 18:20:15 +02:00
Axel Uhl 442a10799b Merge branch 'ubilabs--rcapp--bug-3010' 2015-07-17 17:20:10 +02:00
Axel Uhl 1d64056abb Merge branch 'bug3122' 2015-07-17 17:17:39 +02:00
wagnst dabe2270d1 shortened strings for getting smaller wind map buttons 2015-07-17 17:12:05 +02:00
wagnst 3e239deca2 removed slash from CHART_HTML url 2015-07-17 16:59:53 +02:00
Frederik Petersen 466b093635 Now calling new setMinAndMax combined method 2015-07-17 16:48:25 +02:00
Frederik Petersen 68c4d39eef Fixed problem with tick calculation after original 3122 fix 2015-07-17 16:30:23 +02:00
Raimund Wege bbcff314af Added comments and make onResume clearer 2015-07-17 16:02:41 +02:00
Raimund Wege fe0f8753be Remove wind_fragment from location updates in onConnectionSuspended 2015-07-17 15:46:04 +02:00
Peter Siegmund 6e1177e269 activate "intent 'case' branches" 2015-07-17 15:03:43 +02:00
Raimund Wege 64771f1fc1 Make use of translated wind fragment strings 2015-07-17 15:02:32 +02:00