Commit Graph
42664 Commits
Author SHA1 Message Date
Kai Börnert 54716eef63 bug 4425 bug4443 sorting for Chart DetailTypes, small fix for duplicate
Detailtype
2018-04-10 15:12:46 +02:00
Kai Börnert 5acbd30105 bug 4425 bug4443 sorting for Chart DetailTypes, small fix for duplicate
Detailtype
2018-04-10 15:10:39 +02:00
Kai Börnert dec1006a19 smaller code style improvements 2018-04-09 17:30:32 +02:00
Kai Börnert 8a9137e600 Merge branch 'master' into bug4425
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/nodes/IdleOverallLeaderBoardNode.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsDialogComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/OverallLeaderboardSettingsDialogComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.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/leaderboard/MultiRaceLeaderboardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
2018-04-09 15:04:51 +02:00
Axel Uhl f454439d82 reverted effects of 7323e186fc, only importing server package and not requiring the entire bundle
Change-Id: I997e99c8a09f2f0e862f66953cb89b84237be567
2018-04-08 01:09:17 +02:00
Axel Uhl 7323e186fc let gateway bundle require com.sap.sailing.server bundle to let Shiro find bearer token class
Change-Id: I67c9c1ba2d94875d02753fbfa7b93dedaf6e3ebf
2018-04-07 19:38:30 +02:00
Axel Uhl d387b35201 Merge remote-tracking branch 'server/master'
Change-Id: I8610384bceecec287b3018ad94fd910a5d378de3
2018-04-06 17:34:29 +02:00
Axel Uhl 827824f699 re-added "boat" field to competitor serialization for backward compatibility
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
2018-04-06 17:31:05 +02:00
Vladislav Chumak 8fd27a2e5c Merge remote-tracking branch 'origin/maneuver_refactoring' 2018-04-06 14:47:24 +02:00
Axel Uhl 28c36a449c don't add all leaderboards to leaderboard group during structure import if leaderboard group already exists
Change-Id: I7ee465e48c5090f18529f506240a0653923dbdf0
2018-04-06 11:44:36 +02:00
Axel Uhl 0666d49ff1 formatting and exception handling in EventParser
Change-Id: I6157b664a34106d7681651dfc2119047880395ce
2018-04-06 11:39:27 +02:00
Axel Uhl 624a2dee0b use UrlConnectionHelper in XRR structure importer
Change-Id: I484dfd088998fe1193ef7b79d08dcb61a57a5fb0
2018-04-06 11:33:33 +02:00
Vladislav Chumak 5f057d88e9 Added gpsFixesCount before and after maneuver to estimation data export 2018-04-05 20:26:51 +02:00
Axel Uhl 23cad183dc Merge remote-tracking branch 'server/master'
Change-Id: I12c14f5b430eb11a7b398b314da948b5c3246fdf
2018-04-05 17:26:22 +02:00
Axel Uhl 5e7a40092b bug4497: ConfirmationPlace now adds u/v parameters in token generation; preserve encoded characters in fragment upon language switch
Change-Id: Id083e1fc98c0a99cca9eceb51d1f3d03236b3d03
2018-04-05 17:24:59 +02:00
Axel Uhl 42ce1f395f be tolerant against exceptions being thrown in DevMode on IE for registering Storage callback listener
Change-Id: If3734d37377dde87ec3557471d2deb984695278d
2018-04-05 17:24:24 +02:00
Axel Uhl 92aea92856 fixed classpath for classic DevMode launch
Change-Id: Iadd125a144ba6f4f42f23873e4fc3bd353409d46
2018-04-05 17:22:44 +02:00
Kai Börnert f329d8114e Merge branch 'bug4451' 2018-04-05 14:44:59 +02:00
Axel Uhl 3626d8f9e9 Merge branch 'master' into bug4451
Change-Id: I0e5b95f478fd3a3d5c044be19ebd714eb3428376
2018-04-04 13:56:58 +02:00
Axel Uhl cfffd74c0c Merge branch 'bug2822_boatcolors'
Change-Id: I2e4c424220d26c0286e0cb497ff38384bf22ecaf
2018-03-31 18:25:41 +02:00
Axel Uhl 166f91586c Merge remote-tracking branch 'server/bug2822_boatcolors' into bug2822_boatcolors
Change-Id: I3eb91821c20b6c71a0d53131ffd192a010df5c78
2018-03-31 18:25:24 +02:00
Vladislav Chumak c68601dd5a Added Abs. relative bearing to the next mark data mining statistics 2018-03-31 02:26:19 +02:00
Vladislav Chumak 74c6ffee72 Merge remote-tracking branch 'origin/master' into maneuver_refactoring
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuversWithEstimationDataJsonSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-03-31 01:54:14 +02:00
Vladislav Chumak 145065904c Bugfix for JsonSerializer for complete maneuver curves with estimation
data
2018-03-30 16:40:21 +02:00
Vladislav Chumak 085ac58ba0 Completely replaced the term "angular velocity" with "turning rate" 2018-03-30 16:22:05 +02:00
Vladislav Chumak 43efbd72ac Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-03-30 16:11:43 +02:00
Axel Uhl c2afc5fc5c Merge branch 'bug2822_boatcolors' 2018-03-30 16:09:13 +02:00
Axel Uhl c6a12595f8 updated release notes for bug2822 2018-03-30 16:04:19 +02:00
Vladislav Chumak 3c9801e7b0 Improved data mining of complete maneuver curves with estimation data 2018-03-30 04:17:56 +02:00
Axel Uhl 18bc54c3ca obtain vimeo JavaScript through https, avoiding "mixed content" message 2018-03-30 00:01:55 +02:00
Vladislav Chumak 795f322717 Added gpsFixesCount to complete maneuver curve with estimation data 2018-03-29 23:07:25 +02:00
Vladislav Chumak 0ba9e2b019 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-03-29 20:15:37 +02:00
Kai Boernert a405e3e52c bug4425 prevent issues with serialisation 2018-03-29 18:09:30 +02:00
Axel Uhl 1109118f80 Merge remote-tracking branch 'origin/translation' into bug2822_boatcolors
Change-Id: I0cfd65ee8c41cc42676ee29f175a587464f30697
2018-03-29 17:49:22 +02:00
service.tip.git 0d064cca2f [INTERNAL] Translation delivery: commit by SLS
Change-Id: Ib0710d9ce33f27d509ba7175e6544f45feebce16
2018-03-29 15:44:08 +00:00
Kai Boernert 67225a85c7 Merge branch 'master' into bug4425
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/configs/impl/AutoPlayClassicConfiguration.java
2018-03-29 14:48:50 +02:00
Axel Uhl 7d987f9c32 Merge branch 'master' into bug2822_boatcolors 2018-03-28 23:41:24 +02:00
Vladislav Chumak c60d994a72 Improved messages and bugfix 2018-03-28 22:18:26 +02:00
Axel Uhl c7483f8c7c Merge branch 'master' into bug2822_boatcolors
Change-Id: I6d4a857db20d54387b13b107af96567facecca1f
2018-03-28 18:27:42 +02:00
Axel Uhl b3936b4bc2 Merge branch 'master' into bug4495
Change-Id: I96bc17a9e9c12b49dff70f6c027b5ee561cfc670
2018-03-28 18:25:55 +02:00
Axel Uhl 5e228374a3 removed unused method, improved Javadoc
Change-Id: I4ec6d4138685d4900688624f1fcd47eb31e6c94b
2018-03-28 18:25:34 +02:00
Axel Uhl 9b72154f4d fixed missing registerSelectionModelOnNewDataProvider call on TableWrapper
Change-Id: I58059793cecfb010f6c6228a4e6766749e6ebe50
2018-03-28 18:05:35 +02:00
Axel Uhl 75180d53dc added -style PRETTY to GWT Sailing SDM launch config
Change-Id: I3e49eb186396b247b97fed84159411db83ade21a
2018-03-28 17:33:36 +02:00
Vladislav Chumak b4f14463b8 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-03-28 15:06:04 +02:00
Axel Uhl 3b22d59017 enhanced log message when replacing a competitor, showing boat info
Change-Id: Ic80f271c543d91aa16f0eda1dde8faba916127ea
2018-03-28 12:54:45 +02:00
Axel Uhl ad071774ee Merge branch 'master' into bug2822_boatcolors
Change-Id: Iab23f213fa7ea48ccd24cb010f55fdd66728f182
2018-03-28 11:31:03 +02:00
Axel Uhl 57a83ebd14 whitespace/formatting/comment changes only
Change-Id: I7722a9f6fe5490bd8795dc9457d3c7628259ad3f
2018-03-28 11:30:37 +02:00
Axel Uhl cd454b38b6 Merge branch 'master' into bug4495
Change-Id: Ide0a1d66ce595e34aa0e3a628543c70696ab6501
2018-03-28 11:30:18 +02:00
Kai Boernert 2df24729bd cleanup bugfix for bug4494 2018-03-28 10:27:39 +02:00
Kai Boernert 6301647def Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-03-28 10:14:23 +02:00