eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-24 21:13:50 +00:00
Code Activity
25,794 Commits 276 Branches 259 Tags
ec097a63e764a1826df697cec54c2dd0e438e564
Commit Graph
25794 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fmittag 674728080d added RS800 boat class and boat class image 2015-06-18 16:04:34 +02:00
Axel Uhl 9c319315a7 Merge branch 'master' into bug2970 2015-06-18 15:56:48 +02:00
Axel Uhl 86c156f7a9 Merge branch 'master' into jbross-dependent-race-start 2015-06-18 15:55:14 +02:00
Axel Uhl bab6a51fc7 Merge remote-tracking branch 'server/master' 2015-06-18 15:54:35 +02:00
Axel Uhl 1ca11a4504 fixed post-merge issues, mostly changing race ID from Serializable to String in RCApp 2015-06-18 15:52:52 +02:00
Steffen Tobias Wagner 73b359b82c fixed spelling 2015-06-18 12:05:15 +00:00
Axel Uhl d7c053314b fixed merge problem to make compilable again 2015-06-18 13:47:03 +02:00
Alexander Ries 6e319adb9e fixed testWindAdditionReplication by adding startOfTrackingReceived to local trackedrace used there 2015-06-18 13:46:59 +02:00
Axel Uhl 535654593c Merge branch 'master' into jbross-dependent-race-start 
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	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/data/DataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.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/ui/fragments/RaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
 2015-06-18 13:45:50 +02:00
Alexander Ries 7e33666c6c Revert "set startOfTracking to now on local created trackedRace in TrackedRaceContentsReplicationTest" 
This reverts commit cdc9301344.
 2015-06-18 13:37:59 +02:00
Peter Siegmund 8fbc09fab8 replaced ProgressDialog with ProgressBar (spinner) as overlay 2015-06-18 12:13:08 +02:00
Peter Siegmund dc367b486a added refresh data into LoginActivity 2015-06-18 12:12:14 +02:00
Peter Siegmund 90594e39fe removed obsolete overflow menu item 2015-06-18 12:10:34 +02:00
fmittag bbcea87fa4 one more improvement for the race list (time format) 2015-06-18 11:31:13 +02:00
fmittag a2de23abf4 improved races list view for small form factors 2015-06-18 11:08:34 +02:00
Axel Uhl 2cc61f15dd Merge branch 'master' into bug2970 2015-06-18 10:47:35 +02:00
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