Axel Uhl
30f1fa3e86
pass through the decision whether charts would be shown, based on client height
2015-11-17 23:07:52 +01:00
Axel Uhl
c15e62e494
Merge branch 'master' into bug3345
2015-11-17 22:19:24 +01:00
Axel Uhl
958d1d0a6c
fixed mode adjustment after target platform p2 repository upload
2015-11-17 22:19:06 +01:00
Axel Uhl
cea5937612
Merge branch 'master' into bug3345
2015-11-17 22:04:25 +01:00
Axel Uhl
f3e0a276b6
fix for bug 3367: CompetitorDTOImpl.getSailID() must return null when boat is null
2015-11-17 16:59:45 +01:00
Axel Uhl
302a113da1
replaced Jackson LGPL target platform bundles by Apache-licensed versions
2015-11-17 09:43:20 +01:00
Axel Uhl
f3043d5937
allow RaceBoardPanel to operate without competitor chart and wind chart and mark passing editing panel is screen is small; bug 3345
2015-11-16 18:15:13 +01:00
Axel Uhl
a3d7af5bf0
coding conventions
2015-11-16 18:14:48 +01:00
Axel Uhl
795a98f8aa
Merge branch 'blogintegration'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
2015-11-16 15:31:57 +01:00
Axel Uhl
2d039b024d
set file encoding for russian TextMesages to UTF-8
2015-11-16 15:18:44 +01:00
Axel Uhl
3ab795ee7b
added Russian and Chinese translations for Blog
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
2015-11-16 15:11:55 +01:00
Axel Uhl
2cd993e44b
fixed merge results for Header.ui.xml after adding Blog and moving text messages from StringMessages to TextMessages
2015-11-16 15:10:11 +01:00
Axel Uhl
a523c26fd3
Merge branch 'bug3296' into blogintegration
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
2015-11-16 15:08:17 +01:00
Axel Uhl
1a5dd70611
added Russian and Chinese translations for Blog
2015-11-16 14:59:28 +01:00
Axel Uhl
7231e75f69
Merge remote-tracking branch 'server/blogintegration'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml
2015-11-16 14:45:21 +01:00
Axel Uhl
403727ef40
fixed spelling of RaceCommittee enum literal
2015-11-16 11:15:46 +01:00
Axel Uhl
8cadeb43b1
removed logging for calendar link response
2015-11-16 11:13:15 +01:00
Axel Uhl
c55ed74fc9
exception handling in case unknown solutions tab is requested; defaulting to SAP in Sailing
2015-11-16 11:12:08 +01:00
Axel Uhl
c633d6d0c9
null-check for navigationTab parameter in Solutions.scrollToView; defaulting to sapInSailingDiv
2015-11-16 11:08:17 +01:00
Axel Uhl
5548cc5311
removed GWT.debugger() statement
2015-11-16 11:04:26 +01:00
Axel Uhl
4c3da325bb
Merge remote-tracking branch 'server/master'
2015-11-16 10:13:42 +01:00
Axel Uhl
ab0b6754e1
special handling for calendar link
2015-11-16 10:11:21 +01:00
Axel Uhl
7fd8016aaf
Merge branch 'master' into bug2822_boatcolors
2015-11-14 17:05:55 +01:00
Axel Uhl
d79018c4d1
fixed typo in StringMessage
2015-11-14 02:24:42 +01:00
Axel Uhl
2bcf6508ce
Merge remote-tracking branch 'server/master'
2015-11-13 18:40:23 +01:00
Axel Uhl
664489ad6b
fixed message properties parameter number
2015-11-13 18:38:40 +01:00
Axel Uhl
a4ca35b7a7
formatting
2015-11-13 18:24:30 +01:00
Axel Uhl
70c44ca125
Merge remote-tracking branch 'server/bug2822_boatcolors' into bug2822_boatcolors
2015-11-13 16:37:25 +01:00
Axel Uhl
e3b2823919
added color provider to CompetitorSelectionModel in EmbeddedMapAndWindChartEntryPoint in case of competitors being shown
2015-11-13 16:28:02 +01:00
Axel Uhl
6deb5114ef
Merge branch 'master' into bug2822_boatcolors
...
merge conflicts in EmbeddedMapAndWindChartEntryPoint were due to the parallel insertion of additional entry point URL parameters
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
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/raceboard/EmbeddedMapAndWindChartEntryPoint.java
2015-11-13 16:25:21 +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
Axel Uhl
1789cd055c
Merge remote-tracking branch 'server/master'
2015-11-12 11:28:55 +01:00
Axel Uhl
e0f4e77b88
Merge remote-tracking branch 'server/master'
2015-11-12 11:28:07 +01:00
Axel Uhl
0bfe653d7a
formatting, coding conventions
2015-11-12 10:58:47 +01:00
Axel Uhl
e3fdf6dfed
Updated amazon ec2 (markdown)
2015-11-12 09:57:59 +00:00
Axel Uhl
74a5e73f11
implemented the showCompetitors parameter for EmbeddedMapAndWindChartEntryPoint
2015-11-11 18:29:44 +01:00
Axel Uhl
b855166d61
trim leaderboard and leaderboard group names in their dialogs
2015-11-11 18:24:52 +01:00
Axel Uhl
bc8e783d77
StringConstantsListEditorComposite now handles trailing blanks correctly; added i18n support for a few AdminConsole messages
2015-11-11 18:21:37 +01:00
Axel Uhl
36e7a53e11
started to introduce new parameters to EmbeddedMapAndWindChartEntryPoint in preparation of using it for smartphone views
2015-11-11 18:20:54 +01:00
Axel Uhl
f15100cd86
migrated TrackedRaceImpl.isLive to using TimePoint instead of Date
2015-11-11 10:54:39 +01:00
Axel Uhl
303475ab26
format update to polar Javadoc
2015-11-11 10:52:17 +01:00
Axel Uhl
75a3619a53
Merge remote-tracking branch 'server/master'
2015-11-11 09:21:44 +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
Axel Uhl
9ec7dd24f8
Merge remote-tracking branch 'server/master'
2015-11-10 15:49:12 +01:00
Axel Uhl
01e7ca77b3
Merge branch 'master' into bug3350
2015-11-10 14:29:57 +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
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
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
Axel Uhl
da80201a3e
Merge branch 'master' into bug3199
2015-11-05 16:47:07 +01:00
Axel Uhl
7c89d20bb5
Merge branch 'master' into bug3348
2015-11-04 10:57:14 +01:00
Axel Uhl
93e6cdb5d4
added backward compatibility for "event" field in search results
2015-11-04 10:57:00 +01:00
Axel Uhl
34c4b08092
search result now returns multiple events per leaderboard
2015-11-03 18:20:09 +01:00
Axel Uhl
26c7f3ada9
made autoSelectMedia the default for RaceBoard as per Stefan's request
2015-11-03 16:21:22 +01:00
Axel Uhl
d63eb74d09
removed unused resultRegattaDetails UI field in SearchResultItem UIBinder; code formatting changes
2015-11-03 14:04:18 +01:00
Axel Uhl
132b879875
some formatting, single point of exit, Javadoc
2015-11-03 11:57:11 +01:00
Axel Uhl
e4ef051111
Merge branch 'master' into bug3199
2015-11-03 11:13:03 +01:00
Axel Uhl
652cd4a4e3
fixed date/time deprecations in EventDatesFormatterUtil and removed redundant check for "within one day" that was without effect
2015-11-03 11:10:27 +01:00
Axel Uhl
c2b71627e4
clean-up, removing empty lines, formatting
2015-11-03 10:47:29 +01:00
Axel Uhl
7ade288115
Merge remote branch 'origin/bug3347'
2015-11-02 23:26:18 +01:00
Axel Uhl
a732d4ea7a
fixed behavior of SharedDomainFactoryImpl.getOrCreateBoatClass to fulfil specifications expressed by BoatClassWithNullNameTest
2015-11-02 18:39:18 +01:00
Axel Uhl
58c08e2ee9
Merge branch 'master' into bug3347
2015-11-02 18:29:29 +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
b225e7a6a7
added test ensuring that ESS boat class names are still recognized as potentially having a non-upwind start
2015-11-02 15:31:42 +01:00
Axel Uhl
41d571c35d
fixed how upwind start is determined based on boat class names, using the same unification mechanism used for other boat class name lookups
2015-11-02 15:27:47 +01:00
Axel Uhl
dba0774dd0
fix for bug 3347: canonicalize all boat class name look-ups systematically, and store only canonicalized keys
2015-11-02 15:10:10 +01:00
Axel Uhl
2788334c07
added two passing tests around bug 3347 as regression tests
2015-11-02 14:55:00 +01:00
Axel Uhl
bea4cf4e61
added another failing test case for bug 3347
2015-11-02 14:53:13 +01:00
Axel Uhl
7d3a9d8f9f
added failing test case for bug 3347
2015-11-02 14:51:21 +01:00
Axel Uhl
cceb33ab91
Merge branch 'bug3346' into bug2822_boatcolors
2015-10-30 20:19:17 +01:00
Axel Uhl
0a0f2922fa
added missing class LowPointForLeagueOverallLeaderboard
2015-10-30 18:32:15 +01:00
Axel Uhl
368917f1ae
when comparing by "last race", compare by last race and subsequently previous races; should solve bug 3346;
...
also implements a new scoring scheme LowPointForLeagueOverallLeaderboard
2015-10-30 18:29:40 +01:00
Axel Uhl
74ae901bdc
fixed merge accident regarding streamlet color constructor parameter for RaceMap
2015-10-28 21:03:10 +01:00
Axel Uhl
cc0c67be35
Merge branch 'ribdashboard' into scl2015
2015-10-28 15:22:27 +01:00
Axel Uhl
dabe978201
Merge branch 'master' into scl2015
2015-10-28 15:21:43 +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
eb40de92bb
Merge branch 'bug2822_boatcolors' into scl2015
2015-10-28 15:15:48 +01:00
Axel Uhl
10f0686ea7
fix for bug 3339: serializing series/fleets for regatta leaderboards
2015-10-27 20:11:59 +01:00
Axel Uhl
486b41862a
added boat class name alias "24MR" for 2.4 Meter class
2015-10-27 11:21:44 +01:00
Axel Uhl
5364ab9ffc
Merge remote-tracking branch 'server/master'
2015-10-27 09:27:06 +01:00
Axel Uhl
adc4d00bfe
addressing security audit messages about unreleased resource streams in apps
2015-10-27 09:19:21 +01:00
Axel Uhl
4164be88ce
fixed i18n for image upload text
2015-10-26 17:53:44 +01:00
Axel Uhl
170318d6e0
more i18n for ImageDialog error messages
2015-10-26 16:13:51 +01:00
Axel Uhl
ef55071fa5
formatting only
2015-10-26 16:11:58 +01:00
Axel Uhl
b881fde8cf
more i18n for ImageListComposite
2015-10-26 16:09:35 +01:00
Axel Uhl
9b0a0239bf
more code formatting
2015-10-26 16:04:10 +01:00
Axel Uhl
96fc48b0a5
applied code formatting
2015-10-26 16:02:44 +01:00
Axel Uhl
ea3253d30a
added i18n for ImagesListComposite buttons
2015-10-26 15:48:52 +01:00
Axel Uhl
61e6b9c85c
removed the unused bebas font
2015-10-23 11:25:10 +02:00
Axel Uhl
5919da391b
Merge branch 'master' into bug3296
2015-10-22 16:41:19 +02:00
Axel Uhl
f4fd9dd86b
Merge remote branch 'origin/master'
2015-10-22 15:57:00 +02:00
Axel Uhl