Commit Graph
25638 Commits
Author SHA1 Message Date
fmittag f371927d98 moved showMapsControls setting back to the right place 2016-05-13 14:19:02 +02:00
fmittag 9026796f8a Merge remote-tracking branch 'origin/master' into bug2610_lifecycle 2016-05-13 14:00:03 +02:00
fmittag 25c7fcb845 Merge remote-tracking branch 'origin/master' into bug2610_lifecycle
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/PlayerActivity.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.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
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardViewConfiguration.java
2016-05-13 13:51:23 +02:00
Axel Uhl bb132d724b extended admin console release notes
Change-Id: I36a9af1fc77a74afab2a694b3bc8fdbf881e956e
2016-05-13 12:48:38 +02:00
Axel Uhl 4821504f76 added M32 to list of boat classes that get a 32' catamaran as vector graphics
Change-Id: I01b23647163d6bed8382f4b915b53b3e2e513df9
2016-05-13 12:41:11 +02:00
Benjamin Barth 722f06f4a0 Added another test case for ResourceBundleStringMessages 2016-05-13 11:18:31 +02:00
Benjamin Barth 7464f5bbe7 Removed no longer needed *_en.properties 2016-05-13 11:15:28 +02:00
Benjamin Barth 50578c54ad Added test case to check fallback of ResourceBundleStringMessages 2016-05-13 11:12:45 +02:00
Benjamin Barth 11db97e940 Merge branch 'translation' into bug3645 2016-05-13 10:47:28 +02:00
Benjamin Barth 8c1cc476db Adjusted locale lookup behavior for ResourceBundleStringMessages 2016-05-13 10:39:46 +02:00
Axel Uhl 9004114cfc describe the effects of bug3624 in race management app release notes
Change-Id: I1ebaaba3d936bd1d56d844d165a0d68091fa90d8
2016-05-13 09:04:59 +02:00
Axel Uhl 27476cc851 Merge branch 'master' into ubilabs--rcapp--bug-3624 2016-05-13 08:37:42 +02:00
Axel Uhl 96235b08cc Merge remote-tracking branch 'server/master' 2016-05-13 00:38:34 +02:00
Axel Uhl 38e0ea2ce5 fixed issue with null TimePoint and Candidate comparator; was problematic for proxy (start/end) node candidates with null TimePoints
Change-Id: Ic0b00d0d64ebe8e67e423cebb31f0e85a0f67c18
2016-05-13 00:37:52 +02:00
Axel Uhl 0ff1b8dbb5 fixed typo in Javadoc
Change-Id: I0a7f9448a87d7a88b9a3f4b959675e864f16d7b9
2016-05-13 00:37:25 +02:00
Axel Uhl c433665fad refresh waypoints each time the mark passing panel is opened
Change-Id: I0653b48f717a7b7ff97365288eae7475857005c3
2016-05-13 00:05:44 +02:00
Axel Uhl 14d8e93fdf improved error handling for GPS file import
Change-Id: I4941d73475c6ed3ce8df61210b0161f0ac197303
2016-05-12 23:01:22 +02:00
Axel Uhl ad96b7963a copied _zh_CN files to _zh files after import from TEW
Change-Id: I26b5659a39e8384b671699ce2338d55e4d455922
2016-05-12 18:50:04 +02:00
Axel Uhl d16e46d02f Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
2016-05-12 18:46:17 +02:00
Steffen Tobias Wagner (D059727) 9d83bc51de Added M32 catamaran boat class masterdata 2016-05-12 18:19:02 +02:00
fmittag c737b840cf Implemented the composite settings dialog for a perspective for the component instance version 2016-05-12 17:11:40 +02:00
service.tip.git 71d8f10bc7 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-12 13:08:03 +00:00
service.tip.git 4eba2dcee3 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-12 13:07:30 +00:00
service.tip.git 0d432fd67b Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-12 13:05:51 +00:00
Axel Uhl 1b9423c974 Merge remote-tracking branch 'server/master' 2016-05-12 14:14:44 +02:00
Axel Uhl ae02ba8a9d made the synchronization for mark passing calculator finishing timing independent
Change-Id: I848da90ecf1451bbc9572fe4662022c69f7899fc
2016-05-12 14:08:34 +02:00
Axel Uhl 869abfcca9 Merge branch 'master' into bug3632 2016-05-12 13:50:47 +02:00
Axel Uhl 4865820046 fixing bug 3650 by using the top-level document's ClassName field for the boat class creation
Change-Id: I92a07396718db0393fe2034390eba008061be5a8
2016-05-12 13:45:08 +02:00
Axel Uhl e6ca196556 search for Shiro exception in SerializationException message to improve error response to client
Change-Id: Id7925ce44ee4737c15d5c765a2bbf8de6bdeb8b0
2016-05-12 13:35:56 +02:00
Axel Uhl e3a5ab9957 cleaned string messages, removing extra whitespace
Change-Id: I42deb841e37c7004e9e85239bce2a048402a7460
2016-05-12 10:57:04 +02:00
Axel Uhl 687519f223 added a few TODOs for alternatively mapping devices to marks instead of competitors 2016-05-12 08:35:40 +02:00
Axel Uhl d627d0f434 fixed DurationTest verdict for asHours()
Change-Id: Ib180aa2bf653a6d579bdc98ba61e8377b2bd3348
2016-05-12 07:23:39 +02:00
Axel Uhl bd020bf5d0 Merge branch 'bug3648' into bug3632 2016-05-11 18:47:20 +02:00
Axel Uhl 5985aad653 fixed DurationTest verdict for asHours()
Change-Id: Ib180aa2bf653a6d579bdc98ba61e8377b2bd3348
2016-05-11 18:47:03 +02:00
Axel Uhl 135cb2ccb1 factored the waiting for the MarkPassingCalculator's computations to finish
Change-Id: I3d302e5f898939d4c9deecc383a1c0398ef40dcc
2016-05-11 18:42:16 +02:00
Axel Uhl ca7ff25d43 consolidated imports
Change-Id: I43ffeadc3b674c6bf58ff56f81ea00d2e5e5440e
2016-05-11 18:40:24 +02:00
Axel Uhl 57cb16c63d added test for filtering candidates after the race has been finished using the blue flag down event
Change-Id: Ic59a638146f0ed2b6e9ed46c4fe91e499affb47e
2016-05-11 18:39:42 +02:00
Axel Uhl 1758998f4f test case for time-based filtering of candidates in CandidateFinder, both for positive and negative filtering
Change-Id: I220ee75bf4363e135882ba4ba8746d48a742b7bd
2016-05-11 18:22:43 +02:00
Axel Uhl f12871eb0b Merge branch 'bug3648' into bug3632 2016-05-11 17:55:25 +02:00
fmittag 78e79b5d0d implemented some functions for editing composite perspective settings based on component instances (and not ComponentLifecycle instances) 2016-05-11 16:44:48 +02:00
Axel Uhl 58fe16e106 Merge branch 'master' into bug3632 2016-05-11 16:39:47 +02:00
Axel Uhl 0435f3e0d3 Merge branch 'master' into bug3648 2016-05-11 16:33:43 +02:00
Axel Uhl 214faed7cc Merge branch 'tracapi-3.2.0' 2016-05-11 16:33:17 +02:00
Axel Uhl 72129e6311 adjusted RaceRecord and added hasReplay(), using it in test case
Change-Id: Id39dafc4bae4fb36118de779e4abf55fd401fbe6
2016-05-11 16:32:41 +02:00
Axel Uhl 9a938809d7 introduced DistanceCache.clear() and use it in GPSFisTrackImpl.resumeValidityCaching()
Change-Id: I16ccce132525ff7e4ee1133d94330204d18540a7
2016-05-11 15:18:01 +02:00
Axel Uhl fbd79b6dde failing test case for bug 3648; introduced Speed.travel(Duration)
Change-Id: Ib164a12b0330f8c99251031553866435e82632fe
2016-05-11 15:15:05 +02:00
service.tip.git 019fc13e3d Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-11 12:28:14 +00:00
service.tip.git 2e420032a1 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-11 12:25:49 +00:00
service.tip.git a21eef3ce1 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-11 12:24:42 +00:00
service.tip.git 426cd3fa14 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-11 12:24:09 +00:00