Commit Graph
25878 Commits
Author SHA1 Message Date
Peter Siegmund de64ca4de9 Bug 2900 - In-App update brings crash 2015-06-18 09:44:39 +02:00
Alexander Ries cdc9301344 set startOfTracking to now on local created trackedRace in TrackedRaceContentsReplicationTest 2015-06-18 08:44:43 +02:00
Alexander Ries 674443c2ed set startOfTracking to now on local created trackedrace in InitialLoadReplicationObjectIdentityTest 2015-06-18 08:38:37 +02:00
Axel Uhl 32f44fc669 more logging in case MarkPassingCalculator thread terminates / ends 2015-06-18 01:26:50 +02:00
Axel Uhl 3c87e50919 fixing commit 2973 by adding synchronization on the competitor's candidate sets 2015-06-18 01:25:45 +02:00
Axel Uhl 3f5381ec9e don't stop mark passing calculator only because race reaches status FINISHED. More events, e.g., form the RaceLog may be coming. Fixes bug 2974. 2015-06-18 01:20:35 +02:00
Axel Uhl 1579d0ef26 fixed NPE in CandidateChooserImpl 2015-06-18 00:24:40 +02:00
Axel Uhl 39baea5873 use a synchronized set to fix bug 2973; however, now I'm seeing a NPE at a different spot. Related? 2015-06-18 00:22:08 +02:00
Axel Uhl 39573c8928 using setInnerHTML instead of setInnerText in order to set labels to  ; see bug 2972 2015-06-17 22:31:50 +02:00
fmittag d502d65c73 Merge remote-tracking branch 'origin/master' 2015-06-17 20:38:34 +02:00
fmittag 13acdd4684 changed the BoatClassImageResolver to return always a valid boat class image 2015-06-17 20:38:07 +02:00
Alexander Ries f025294bc9 fixed WindByRaceLogTest by adding setting startOfTracking of local test trackedRace to now 2015-06-17 18:31:26 +02:00
Alexander Ries 0f9d156fd6 removed line that sets startOfTrackingReceived at the creation of trackedRace in TrackedRegattaImpl 2015-06-17 18:09:46 +02:00
Axel Uhl 294eb92b3b fixing bug 2970 by pulling up ranking metrics list box in regatta dialog hierarchy and using in DefaultRegattaCreateDialog 2015-06-17 17:49:08 +02:00
Steffen Schaefer 2d735a532f Changes to not use java.util.Locale.forLanguageTag as it isn't supported
in Android API < 21
2015-06-17 16:20:01 +02:00
Christopher Ronnewinkel (D036654) e5a39ff88d Merge remote-tracking branch 'ExternalGit/raceboard-simulation' 2015-06-17 15:32:00 +02:00
Christopher Ronnewinkel (D036654) 203e0fbfc8 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-06-17 15:30:51 +02:00
fmittag 000a7f0720 Merge remote-tracking branch 'origin/master' 2015-06-17 15:22:57 +02:00
fmittag e10236faee added some more boat classes to masterdata class 2015-06-17 15:22:26 +02:00
Simon Pamies 895cc387f6 Merge remote-tracking branch 'origin/master' 2015-06-17 14:15:46 +01:00
Simon Pamies 5d499ed8d0 2958 fixed 2015-06-17 14:15:32 +01:00
Axel Uhl 0960c79835 Merge branch 'ubilabs--rcapp--master' 2015-06-17 15:01:42 +02:00
Axel Uhl f7d263a003 Merge remote-tracking branch 'server/master' 2015-06-17 15:00:44 +02:00
Christopher Ronnewinkel (D036654) 1badef86a4 scale "selected"-cross in simulation-legend; 2015-06-17 13:59:55 +02:00
Peter Siegmund 925010624f removed warnings 2015-06-17 13:54:37 +02:00
Samuel Oey 39c70dbfa8 Merge branch 'ubilabs--rcapp--bug-2969' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
2015-06-17 13:45:22 +02:00
Samuel Oey 25f0dd730a Merge branch 'ubilabs--rcapp--bug-2777-proposal' into ubilabs--rcapp--develop 2015-06-17 13:29:37 +02:00
Samuel Oey ac39d97137 just some clarifications 2015-06-17 12:58:47 +02:00
Samuel Oey 1b60479251 moves the forceLogout from DataHelper to SessionActivity to use centralized logout procedure 2015-06-17 12:34:41 +02:00
Samuel Oey 7a6b8e49f9 removes unneeded onReset in LoginActivity 2015-06-17 12:33:50 +02:00
Steffen Schaefer 7b904b191a Fixed limiting event news 2015-06-17 11:29:51 +02:00
Peter Siegmund 2e2550c938 RCApp: automatically relogin after task kill, if RaceStateService has still data in memory 2015-06-17 11:14:34 +02:00
Alexander Ries 2d7fbc72d6 added trackedrace null check in Flexibleleaderboard remove racecolumn before detaching raceexecutionprovderfrom tracked race 2015-06-17 11:12:36 +02:00
Steffen Schaefer 3e5e577228 Merge remote-tracking branch 'origin/master' into design2015 2015-06-17 11:06:13 +02:00
Steffen Schaefer 0b62b1c9c1 Using VideoDTO for event overview video stage to fix compiler error 2015-06-17 11:05:10 +02:00
Steffen Schaefer a0402c9eca Implemented limit for event news 2015-06-17 10:48:42 +02:00
Alexander Ries a0000140f6 changed text of startline advantage widget 2015-06-17 10:45:27 +02:00
Alexander Ries a1ebe9d79c changed size of LiveAveragePanel unit field 2015-06-17 10:42:11 +02:00
Peter Siegmund 84d59495c4 Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop 2015-06-17 09:25:35 +02:00
Peter Siegmund 5090542d89 Merge branch 'master' into ubilabs--rcapp--master 2015-06-17 09:19:24 +02:00
Alexander Ries be21942b15 hand over strings an no null values as trackedBasedTest createTestTrackedRace in RaceExecutionOrderTests 2015-06-17 09:06:17 +02:00
Peter Siegmund d7860a2000 Deleted test projects, because the real tests are in the "tests"-folder of each app. 2015-06-17 08:57:47 +02:00
Axel Uhl 84de683a82 fixed imports to keep things compilable 2015-06-17 01:23:56 +02:00
Axel Uhl 3a698ab60d Merge branch 'master' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
2015-06-17 01:05:03 +02:00
Axel Uhl 5694d330dd Merge remote-tracking branch 'server/master' 2015-06-17 01:02:35 +02:00
Axel Uhl fe03b5f3fd manually cherry-picked the essential NPE avoidance from commit 612191da42 into master 2015-06-17 00:57:59 +02:00
Axel Uhl 0c76ad12ab factoring commonalities between the different onReset() implementations and (temporarily?) re-activating the "Reload" menu item 2015-06-16 23:44:26 +02:00
Axel Uhl ade3c5aed0 letting SessionActivity handle the reload menu item 2015-06-16 23:27:25 +02:00
Axel Uhl e76a8a954e some Javadoc 2015-06-16 23:22:40 +02:00
Axel Uhl 91cbb8b9d6 keep onReset() in LoginActivity alive in case the "Reload" menu item is re-activated 2015-06-16 22:53:12 +02:00