Commit Graph
1871 Commits
Author SHA1 Message Date
Axel Uhl e6fef6c04f Merge branch 'master' into bug2851
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java

Change-Id: Ifd8c60c6f7d2d2274a68681607a1b5df7b4040b7
2016-01-13 09:39:02 +01:00
Axel Uhl 6d88a75b87 in Igtimi WebSocketConnectionManager.reconnect() wait for the connection for 5s; if not connected, try again with failover URL
Change-Id: I52737084334cdf918fff78643447822de93c2bd6
2015-12-21 10:21:26 +01:00
Jan Broß c39d8a9357 Remove wait for RaceLog from TrackedRace 2015-12-11 14:59:44 +01:00
Jan Broß 244640da51 Refrain from direct access to GPSFixStore 2015-12-04 12:35:27 +01:00
Steffen Schaefer d8b9014d03 Moved media model and util to com.sap.sse.shared.android project because
this is only shared between backend and android but not usable in GWT UI
2015-11-24 11:40:32 +01:00
Axel Uhl 91a144398f adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles 2015-11-18 13:11:44 +01:00
Axel Uhl a0c6a65879 Merge branch 'master' into bug2822_boatcolors 2015-11-10 15:51:43 +01:00
Steffen Schaefer 278ad5984b bug3348: Added some JavaDoc explaining the event filtering for
leaderboard search results in case of series
2015-11-10 15:36:25 +01:00
Axel Uhl 1dfe5c84ba single point of exit pattern in RegattaByKeywordSearchService 2015-11-09 18:25:14 +01:00
Axel Uhl 009827c3b4 removed unnecessary code in RegattaByKeywordSearchService; adjusted to coding conventions 2015-11-09 18:19:55 +01:00
fmittag 2abbc78053 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors 2015-11-09 13:59:30 +01:00
Steffen Schaefer a43a4ed3e6 bug3348: Improved keyword search for series events/leaderboards 2015-11-06 09:28:46 +01:00
Axel Uhl 34c4b08092 search result now returns multiple events per leaderboard 2015-11-03 18:20:09 +01:00
Axel Uhl ad3a19869b fixing bug 3349: using UTF-8 explicitly to decode remote search results 2015-11-02 18:27:06 +01:00
Axel Uhl dd8b481ab5 Merge branch 'master' into scl2015
Conflicts:
	java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startanalysis/StartlineAnalysisCard.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java

Besides whitespace conflicts there was a conflict introduced by the addition of the streamlet colors setting in the
RaceBoardPanel constructor
2015-10-28 15:20:45 +01:00
Axel Uhl e1a5b3aa2c moved the XMLBeans, dom4j and Apache POI stuff to the target platform and updated the Barbados result import bundle accordingly 2015-10-16 18:03:53 +02:00
fmittag 641fc836cc Merge remote-tracking branch 'origin/master' into bug2822_boatcolors 2015-10-15 17:42:48 +02:00
fmittag ddbcf3302f moved competitor/boat structure from TrackedRace to RaceDefinition 2015-10-15 17:39:20 +02:00
Lennart Hensler 1c1332daf9 Removed the UUID from the DataRetrieverChainDefinition 2015-10-14 19:25:25 +02:00
fmittag 6d34af9ede Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2015-10-09 16:22:21 +02:00
Frederik Petersen b37960142b Revert last commit 2015-09-25 15:00:40 +02:00
Frederik Petersen 840d6ca613 Reload racelogs after master data import 2015-09-25 14:57:19 +02:00
Frederik Petersen a02be9adc5 Fixed bug 3286
existing regatta and race logs for imported races are now cleared if
override flag is set.
If override is not set and the log is not empty, the imported log will not
be applied.
2015-09-25 14:52:25 +02:00
Frederik Petersen 6628befff5 Merge remote-tracking branch 'origin/master' into polars
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-09-23 12:36:09 +02:00
Axel Uhl 6def01ac64 implemented LowPointWithEliminationsAndRoundsWinnerGets07 scoring scheme; first tests look good 2015-09-17 22:00:01 +02:00
Axel Uhl 03fe5d2b2d Merge remote-tracking branch 'server/master' into bug3265 2015-09-17 15:45:00 +02:00
Lennart Hensler 899bd718fe Merge remote-tracking branch 'origin/polars' into dataMining 2015-09-17 13:32:23 +02:00
Frederik Petersen 94010bb9fe Added new bundles in launch configs 2015-09-17 13:16:58 +02:00
Lennart Hensler 4d4d09b071 Merge remote-tracking branch 'origin/master' into dataMining 2015-09-17 12:07:43 +02:00
Axel Uhl 6d192b56a9 fir step towards a fix for bug 3270: change API to handle multiple course areas for addition/removal at once 2015-09-16 18:12:59 +02:00
Lennart Hensler 9a4d340362 Merge branch 'dataMining' into polars
Conflicts:
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainBuilder.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainDefinition.java
2015-09-16 15:32:22 +02:00
Frederik Petersen a813515c48 Added new shared gwt project for polar mining
next step: resultspresenter
2015-09-15 10:26:05 +02:00
Axel Uhl 3cde76f678 added Leaderboard parameter to ScoringScheme.getScoreForRank to prepare for sophisticated surfing scoring scheme 2015-09-15 09:38:46 +02:00
fmittag b02fb48d55 fixed competitor/boat assignment replication 2015-09-14 17:42:03 +02:00
fmittag 931e56385d Implemented the competitor/Boat combination stored in TrackedRace domain object as temporary solution
The data is transfered to the UI as part of the RaceMapDataDTO and used in the new CompetitorColorProvider class.
2015-09-12 15:07:08 +02:00
Frederik Petersen 32a8092e5b Merge branch 'master' into polars 2015-09-09 14:37:36 +02:00
fmittag b43786d728 - Implemented loading and storing of a 'isStandaloneServer' attribute of a new SailingServerConfiguration domain object.
- Implemented a tab in the admin console for showing static server information and dynamic server configuration
- refactoring of static BuildVersion class into more generic ServerInfo class
2015-09-02 00:37:41 +02:00
Simon Pamies 84ebd0e5a2 Merge remote-tracking branch 'origin/ribdashboard' 2015-08-22 14:35:34 +03:00
Frederik Petersen 3247f73afc Finished first polar retrieval chain 2015-08-19 13:35:26 +02:00
Frederik Petersen 7bbb0ffd92 Fixed bug3230 by adding the appropriate logstore listeners during import 2015-08-18 10:40:49 +02:00
Axel Uhl 728f06e4c4 made invitational text somewhat clearer, mentioning that the app must be installed first 2015-08-13 06:18:25 +02:00
Axel Uhl 5a3c62df11 fixed accidental empty TODO method overrides in RacingEventServiceImpl introduced by commit 5a3ba9b466 2015-08-07 16:22:37 +02:00
Nick 476f70d394 Merge remote-tracking branch 'origin/master' into tracking-times 2015-07-29 12:05:48 +02:00
Alexander Ries 3932cbc8de Merge remote-tracking branch 'origin/master' into ribdashboard 2015-07-29 11:19:32 +02:00
Axel Uhl d4fce82053 handle unsetting of polar service properly in RacingEventServiceImpl; shut down replication master properly upon bundle stop 2015-07-28 17:49:10 +02:00
Christopher Ronnewinkel (D036654) 1dc6eda165 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-07-28 13:59:52 +02:00
Christopher Ronnewinkel (D036654) cdb0f98871 improve accuracy of end-position of courses; 2015-07-28 13:57:44 +02:00
Axel Uhl b4ffe1ea5e Merge branch 'bug3185' into bug3186 2015-07-27 23:07:48 +02:00
Axel Uhl 82a03565b6 made RegattaImpl.races a ConcurrentHashMap mapping from race name to RaceDefinition, avoiding extra synchronization and speeding up lookup by name 2015-07-27 22:17:42 +02:00
Axel Uhl cd6fe7ef08 added LZ4 bundle to all launch configurations 2015-07-27 18:46:53 +02:00