 Peter Siegmund
|
276f201deb
|
not complete merged!?
|
2015-03-24 17:07:10 +01:00 |
|
|
Peter Siegmund
|
37ab75f057
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-24 17:04:56 +01:00 |
|
 Axel Uhl
|
05e500e95c
|
making mockable method public again; Mockito under Maven just can't do it otherwise
|
2015-03-24 14:32:24 +01:00 |
|
|
Axel Uhl
|
badbd749cd
|
consolidated imports to avoid warnings
|
2015-03-24 11:34:50 +01:00 |
|
|
Axel Uhl
|
5f8ceb6028
|
worked again on scoping the getRaceLogTrackingAdapter() method on LeaderboardResource more restrictively
|
2015-03-24 11:34:20 +01:00 |
|
|
Axel Uhl
|
9a81fe3e70
|
Merge branch 'jbross-buoy-tender'
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
|
2015-03-24 11:16:47 +01:00 |
|
|
Peter Siegmund
|
b233d31443
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-24 10:28:31 +01:00 |
|
|
Axel Uhl
|
61945077a0
|
making method public to allow mocking (?)
|
2015-03-24 07:38:39 +01:00 |
|
 Alexander Ries
|
c51ba95293
|
Merge remote-tracking branch 'origin/master' into ribdashboard
|
2015-03-24 00:05:59 +01:00 |
|
|
Alexander Ries
|
e6e90342c8
|
dashboard displays now logo from event logo url
|
2015-03-23 23:35:28 +01:00 |
|
|
Axel Uhl
|
6fd30c5725
|
improved web service documentation
|
2015-03-23 23:17:01 +01:00 |
|
|
Axel Uhl
|
ab0db8057a
|
slightly restructured tests that needed to see a method from the host bundle; made package protected
|
2015-03-23 23:01:13 +01:00 |
|
|
Axel Uhl
|
f8f3170daf
|
some comment changes
|
2015-03-23 22:48:58 +01:00 |
|
|
Axel Uhl
|
9b4babe883
|
removed flag PNG accidentally added; made method private that no-one else needs to see in TrackedRaceImpl
|
2015-03-23 22:41:32 +01:00 |
|
|
Axel Uhl
|
8267c32263
|
improved Javadoc for new TrackedRace.getTrack(Mark) and old TrackedRace.getOrCreateTrack(Mark); use new getTrack(Mark) in RacingEventServiceImpl
|
2015-03-23 22:30:30 +01:00 |
|
|
Axel Uhl
|
29284adfa4
|
consolidated acquisition of mark position from tracked races, regatta log and race logs
|
2015-03-23 22:25:40 +01:00 |
|
|
Axel Uhl
|
7500d8ed96
|
fixing the broken test for mark pinging; improved how mark tracks are located when pinging and how outlier avoidance is implemented
|
2015-03-23 21:33:56 +01:00 |
|
|
Axel Uhl
|
911cdeb86b
|
Merge branch 'master' into jbross-buoy-tender
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2015-03-23 20:52:00 +01:00 |
|
|
Axel Uhl
|
21343eb3bd
|
Merge remote-tracking branch 'origin/bug2685'
|
2015-03-23 20:40:41 +01:00 |
|
|
Alexander Ries
|
83e8d634f0
|
added i18n to dashboard project
|
2015-03-23 18:33:19 +01:00 |
|
|
Axel Uhl
|
cf99ef2c68
|
Merge branch 'bug2724' into jbross-buoy-tender
|
2015-03-23 18:20:51 +01:00 |
|
|
Axel Uhl
|
f6604516b6
|
changed which gwt modules get compiled locally
|
2015-03-23 18:20:39 +01:00 |
|
|
EC2 Server
|
9455b13f84
|
adjusted raceColumn to race_column
|
2015-03-23 17:14:47 +00:00 |
|
|
EC2 Server
|
afaea9a66d
|
adjusted URL after renaming raceColumn to race_column
|
2015-03-23 17:11:45 +00:00 |
|
|
Axel Uhl
|
fe46823c24
|
fixing bug 2724 by introducing Set to collect marks
|
2015-03-23 17:39:37 +01:00 |
|
|
Axel Uhl
|
60e1499b50
|
changed format and raceColumn parameter name for marks listing service
|
2015-03-23 17:25:45 +01:00 |
|
|
Axel Uhl
|
cf073a1b8e
|
Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
|
2015-03-23 16:38:51 +01:00 |
|
|
Axel Uhl
|
f8c16d1049
|
Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
|
2015-03-23 16:18:37 +01:00 |
|
|
Axel Uhl
|
b4e3b10916
|
whitespace and comment changes only
|
2015-03-23 16:17:36 +01:00 |
|
|
Axel Uhl
|
f88a3f474f
|
added some more table sortability
|
2015-03-23 15:30:28 +01:00 |
|
|
Axel Uhl
|
e9328229d9
|
also fixed sorting of selection checkbox column consistently for all users
|
2015-03-23 15:25:51 +01:00 |
|
|
Axel Uhl
|
6436be635a
|
fixed selection model type for multi-marks control points table
|
2015-03-23 14:33:52 +01:00 |
|
|
Axel Uhl
|
91630cbfbd
|
use only a single selection model for the multi-mark control points table
|
2015-03-23 14:28:27 +01:00 |
|
|
Axel Uhl
|
38a8e97d4f
|
added checkboxes consistently for multi-selection tables; should address both, bug2682 and bug2685
|
2015-03-23 11:59:43 +01:00 |
|
|
Axel Uhl
|
78b728b17d
|
fixing the setting of the leaderboard name for the course copying race list popup
|
2015-03-23 11:30:37 +01:00 |
|
|
Peter Siegmund
|
8480849333
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-23 10:03:48 +01:00 |
|
 Frederik Petersen
|
7c50d96d9a
|
Fixed noSuchElement problem in before start situations in live races
|
2015-03-23 08:45:43 +01:00 |
|
 Lennart Hensler
|
77a656878d
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2015-03-22 22:38:57 +01:00 |
|
|
Lennart Hensler
|
2d52d85efb
|
Fixed the result chart resizing
|
2015-03-22 22:38:15 +01:00 |
|
|
Lennart Hensler
|
bc6edb22f1
|
Improved the data mining test coverage
|
2015-03-22 21:07:17 +01:00 |
|
|
Lennart Hensler
|
11fe706981
|
Implemented DataMiningExecutorService, that uses a BlockingPriorityQueue
|
2015-03-22 20:20:03 +01:00 |
|
|
Peter Siegmund
|
7d5ccc606e
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-22 17:42:52 +01:00 |
|
 fmittag
|
02eb1f3cf1
|
fixed a UI problem with race which can be null
|
2015-03-22 18:14:15 +02:00 |
|
|
Peter Siegmund
|
6db5ee9c08
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-22 15:20:03 +01:00 |
|
|
fmittag
|
ca0f192621
|
improved and unified the way the live state for a race or a raceColumn is calculated
|
2015-03-22 14:23:59 +02:00 |
|
|
Lennart Hensler
|
4d22ac15b9
|
Added a test for the processor instruction order in a PriorityQueue
|
2015-03-21 13:32:01 +01:00 |
|
|
Lennart Hensler
|
dfb1753782
|
Renamed ProcessorInstruction to AbstractProcessorInstruction
|
2015-03-21 13:21:17 +01:00 |
|
|
Lennart Hensler
|
bb65e01ed4
|
Added a priority to the ProcessorInstruction and made it Comparable
|
2015-03-21 12:41:45 +01:00 |
|
|
Axel Uhl
|
641b02357f
|
Merge branch 'master' into bug2715
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
|
2015-03-20 17:44:35 +01:00 |
|
|
Axel Uhl
|
873e1376af
|
Merge branch 'master' into bug2707
|
2015-03-20 17:30:58 +01:00 |
|