Commit Graph
28855 Commits
Author SHA1 Message Date
fmittag f0b9b85de4 Merge remote-tracking branch 'origin/bug2822_boatcolors' into bug2822_boatcolors 2015-11-13 16:17:15 +01:00
fmittag cac08d4e50 added the boat colors to the list of blocked colors in
CompetitorColorProviderImpl
2015-11-13 16:14:17 +01:00
Axel Uhl ff272ba201 i18n support in embedded map 2015-11-13 16:06:22 +01:00
Axel Uhl a5d8fbf449 Merge remote-tracking branch 'server/bug2822_boatcolors' into bug2822_boatcolors 2015-11-13 15:53:53 +01:00
fmittag 59e0582f62 some refactoring to enable the EmbeddedMapAndWindChartEntryPoint to know also about competitor/boat assignments (even when not used yet) 2015-11-13 15:16:49 +01:00
fmittag 67fc1157c7 removed unsued 'eventId' parameter from EmbeddedMapAndWindChartEntryPoint 2015-11-13 13:23:21 +01:00
Axel Uhl afe487e142 adjusted to code formatter conventions 2015-11-10 16:22:12 +01:00
Axel Uhl 969e0e3fb0 some reformatting of Javadoc 2015-11-10 16:21:06 +01:00
Axel Uhl 89495d48fc added warning in case a boat shall be set on a RaceDefinitionImpl for a competitor not part of that race's set of competitors 2015-11-10 16:07:36 +01:00
Axel Uhl a0c6a65879 Merge branch 'master' into bug2822_boatcolors 2015-11-10 15:51:43 +01:00
Axel Uhl 64dabd6944 Merge remote-tracking branch 'server/master' 2015-11-10 15:51:16 +01:00
Steffen Schaefer 3b3a3273f3 Merge branch 'bug3348' 2015-11-10 15:49:29 +01:00
Axel Uhl 9ec7dd24f8 Merge remote-tracking branch 'server/master' 2015-11-10 15:49:12 +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 01e7ca77b3 Merge branch 'master' into bug3350 2015-11-10 14:29:57 +01:00
Fredrik Teschke 4f799bf7f6 add resources folder to maven build 2015-11-10 11:07:37 +01:00
Fredrik Teschke c088df3ff8 Merge branch 'master' of sapsailing.com:/home/trac/git 2015-11-09 19:07:59 +01:00
Fredrik Teschke 9fcf600326 add fix for failing RaceLogStartTimeEvent deserialization 2015-11-09 19:07:18 +01:00
Fredrik Teschke 43db0476eb add failing testcase for RaceLogStartTimeEvent deserialization 2015-11-09 19:06:31 +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
Axel Uhl 3618e57763 fixing bug 3350 by using now-liveDelay as the new time point for {regattaname}/races/{racename}/competitors/live 2015-11-09 18:09:16 +01:00
fmittag 2abbc78053 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors 2015-11-09 13:59:30 +01:00
Lukas Furmanek d702a899db Merge branch 'bug3199' into master 2015-11-09 13:42:30 +01:00
Lukas Furmanek e3cdc1ae08 Bug3199: corrections at variable definitions 2015-11-09 13:19:28 +01:00
Axel Uhl e4eb4246d0 formatting 2015-11-09 13:05:14 +01:00
Axel Uhl 9619b6b5b2 formatting 2015-11-09 13:04:21 +01:00
Axel Uhl 48ea0f5a0f Merge remote-tracking branch 'server/bug3199' into bug3199
Conflicts:
	java/com.sap.sse.common/src/com/sap/sse/common/Util.java
2015-11-09 13:00:10 +01:00
Benjamin Barth f3185a8e39 Merge branch 'master' into bug3348
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/searchresult/SearchResult.java
2015-11-09 11:39:42 +01:00
Lukas Furmanek 5305179dde Merge branch 'tmp' into bug3199 2015-11-08 16:14:44 +01:00
Lukas Furmanek d1e455a573 Bug3199: renamed objekt into object & JavaDoc 2015-11-08 15:05:54 +01:00
Axel Uhl 6f2019a208 formatting 2015-11-06 18:12:23 +01:00
Axel Uhl 52b3c6d981 adjusted to coding conventions, renamed Util.getDominantObject 2015-11-06 18:10:29 +01:00
fmittag c3a72dcc74 simplified passing of competitorsAndTheirBoats without copying 2015-11-06 16:10:59 +01:00
fmittag e29d877820 changed CompetitorDTOImpl to always return a sailID (taken from the boatDTO) 2015-11-06 16:10:27 +01:00
Steffen Schaefer e5da8181fa Fixed filtering of search results without events that was broken after
having multiple events associated to a search result
2015-11-06 11:07:02 +01:00
Steffen Schaefer a43a4ed3e6 bug3348: Improved keyword search for series events/leaderboards 2015-11-06 09:28:46 +01:00
Axel Uhl da80201a3e Merge branch 'master' into bug3199 2015-11-05 16:47:07 +01:00
fmittag d701f0033c changed RaceDefinitionImpl constructor to take a Map of competitor/boat combinations instead of an Iterable 2015-11-05 16:15:02 +01:00
fmittag 3db9d0ca12 renamed competitorSelection to competitorSelectionProvider in RaceBoardPanel 2015-11-05 16:01:52 +01:00
fmittag b32ac7858a added error message in AutoplayController in case something went wrong during loading of race data 2015-11-05 15:57:06 +01:00
fmittag f921af6d1b removed setColor(...) on CompetitorColorProvider, changed creation of map for competitor/colors per race to constructor
added some javadoc to CompetitorColorProvider interface
2015-11-05 15:53:56 +01:00
fmittag cf51578777 removed unused code and comment 2015-11-05 14:55:57 +01:00
Lukas Furmanek 731b97d054 Bug3199: Generic changes and unitTest 2015-11-05 14:33:28 +01:00
Lukas Furmanek af2cb8fdcc Bug3199:Bugfix with a generic boatClassSearch. 2015-11-05 12:55:06 +01:00
Benjamin Barth 012ce47c83 Fixed mobile gallery player autoplay button style on show 2015-11-05 11:57:15 +01:00
Benjamin Barth 82347490f4 Uncommeted prepared What's new content 2015-11-05 11:43:46 +01:00
Benjamin Barth f53c7b2057 Adjusted selection filter label for all options 2015-11-05 11:39:27 +01:00
Benjamin Barth 7b35fc4595 Adjusted filter clear button text to avoid strange render in on mobile
devices
2015-11-05 11:34:24 +01:00
Benjamin Barth 4208f91551 Merge branch 'design2015-bug3348' into design2015 2015-11-05 10:38:27 +01:00