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
Alexander Ries
c51ba95293
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-03-24 00:05:59 +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
29284adfa4
consolidated acquisition of mark position from tracked races, regatta log and race logs
2015-03-23 22:25:40 +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
Axel Uhl
60e1499b50
changed format and raceColumn parameter name for marks listing service
2015-03-23 17:25:45 +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
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
fmittag
02eb1f3cf1
fixed a UI problem with race which can be null
2015-03-22 18:14:15 +02: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
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
6ff52fbfa6
fixed URL parameter handling for competitor columns
2015-03-20 17:00:15 +01:00
Axel Uhl
8041fd0058
fixed leaderboard competitor column stuff (bug 2718)
2015-03-20 15:51:50 +01:00
Axel Uhl
da5a81908c
fix proposal for bug 2718
2015-03-20 15:42:49 +01:00
Simon Pamies
906c267303
Fixed bug 2718 by taking the index of columns inserted before into account
2015-03-20 15:30:29 +01:00
Axel Uhl
495cd85bd0
added distance-considering-gate-start metric also at race level
2015-03-20 14:18:59 +01:00
Axel Uhl
5fd384af5c
added metric for distance including gate start consideration to leaderboard and REST API
2015-03-20 13:34:44 +01:00
Lennart Hensler
571d6cb93a
First attempt to abort dimension value queries, but didn't work
...
So the dimension value query managing is disabled in this commit, to be
able to push an error free state.
2015-03-20 12:16:50 +01:00
Jens Rommel
4c4eafe21c
Reverted inconsistency introduced erronously with recent merge.
2015-03-20 10:52:59 +01:00
Alexander Ries
6911061d6d
solved merge conflics in string messages property files
2015-03-20 10:21:25 +01:00
Lennart Hensler
afb092216e
Merge remote-tracking branch 'origin/master' into dataMining
...
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-19 23:28:18 +01:00
Lennart Hensler
33a8a1d71c
Implemented a simple logic to abort running queries when a new one is sent
2015-03-19 21:53:29 +01:00
Axel Uhl
71b5f6bbdd
implementing bug 2714: offer COG as a competitor chart value
2015-03-19 18:14:36 +01:00
Axel Uhl
d19af01a76
added settings dialog component entry for start to next mark lines; added mgwt and ribdashboard to bundle list
2015-03-19 18:03:08 +01:00
Alexander Ries
e127fdf1db
removed unnecessary constructor from RaceMapZoomSettings
2015-03-19 15:10:32 +01:00
Alexander Ries
f2d7c0be06
removed ugly testing system outs from racemap
2015-03-19 15:03:57 +01:00
Alexander Ries
ef6cc6807b
removed label height constant in combined wind panel
2015-03-19 14:22:00 +01:00
Alexander Ries
736c2acdfc
solved merge conflicts in RibDashboardServiceImpl
2015-03-19 14:02:27 +01:00
Alexander Ries
2c0b4f78b4
startanalysis card uses not racemap with custom settings to display start
2015-03-19 13:54:30 +01:00
Jens Rommel
0ce619194c
Fixed some issues with media presentation:
...
- added support for showing multiple videos at a time
- assigned fixed size to HTML-based video
- added colored style for in-/active video button
- fixed state management when closing video window (used to not notify button state)
2015-03-18 17:18:58 +01:00
Axel Uhl
8c42def011
make DeviceMarkMappingEventFactory a functional interface to compactify code a little more
2015-03-18 16:39:43 +01:00
Axel Uhl
b2fc08d6f9
Merge branch 'master' into jbross-buoy-tender
2015-03-18 15:03:37 +01:00
Jan Broß
19f573331e
Remove obsolete implementation of method
2015-03-18 14:26:53 +01:00
Jan Broß
d3fa7e6860
First working version of Buoy Tender E-Mail invitation
2015-03-17 17:49:05 +01:00
Jan Broß
e2c3d9e1b7
Display buoys of raclogs and tracked races of all races belonging to a leaderboard
2015-03-17 13:47:42 +01:00
Lennart Hensler
7e473d05c9
Merge remote-tracking branch 'origin/master' into dataMining
2015-03-17 13:07:03 +01:00
Axel Uhl
Alexander Ries
Lennart Hensler
fmittag
Simon Pamies
Jens Rommel
Jan Broß