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
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
Benjamin Barth
911395074e
Merge branch 'solutions'
2015-11-13 13:47:47 +01:00
Benjamin Barth
004037849e
Fixed missing enum value in switch/case statement
2015-11-13 13:44:43 +01:00
fmittag
67fc1157c7
removed unsued 'eventId' parameter from EmbeddedMapAndWindChartEntryPoint
2015-11-13 13:23:21 +01:00
Benjamin Barth
a094b0548e
Merge branch 'solutions'
2015-11-13 10:19:13 +01:00
Benjamin Barth
eff293effa
Adjusted translation of desktop menu items
2015-11-13 10:12:37 +01:00
Benjamin Barth
ea9fa178bb
Adjusted russian translation for "Solutions"
2015-11-13 09:59:24 +01:00
Benjamin Barth
e6c8c77c63
Merge branch 'solutions'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml
2015-11-12 16:14:52 +01:00
Steffen Schaefer
5d0292573e
Removed a check for trackedRace that isn't necessary anymore when
...
checking if a competitor is in a specific fleet
2015-11-12 15:38:29 +01:00
Steffen Schaefer
8805498255
Added missing final statements to variables in AbstractRaceColumn
2015-11-12 15:36:01 +01:00
Benjamin Barth
5d0b189440
New image for STG Training Diary on desktop and required layout and
...
styling adjustments
2015-11-12 13:37:32 +01:00
Benjamin Barth
77e501454a
Adjusted image for STG Training Diary on mobile
2015-11-12 13:36:09 +01:00
Benjamin Barth
927c184e7a
Adjusted page styles to avoid overlapping of elements
2015-11-12 13:05:00 +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
Steffen Schaefer
4136ae5aeb
Added .project files for /java, /mobile and /wiki to make it possible to
...
import these as projects into eclipse. Additionally added
filteredResources rules to hide subproject stuff from top level projects
(this fixed an problem that causes resources to be found twice in a
nested project setup).
2015-11-12 10:18:09 +01:00
Steffen Schaefer
1a02c9615b
Merge branch 'design2015'
2015-11-12 08:18:24 +01: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
Benjamin Barth
aa9d67362d
Adjusted German, Russian and Chinese texts on the solutions page
2015-11-11 11:06:11 +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
Benjamin Barth
c5b329254d
Changed field to local variable as the value is only used once
2015-11-10 17:28:19 +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
7b56584509
Merge branch 'master' into design2015
2015-11-10 15:51:09 +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
Steffen Schaefer
6c3b9b1a41
Removed unused code and import
2015-11-10 15:22:39 +01:00
Steffen Schaefer
bf6e14fdfa
Merge remote-tracking branch 'origin/master' into design2015
2015-11-10 15:20:45 +01:00
Benjamin Barth
f34278200e
bug2337: Added "leaderboardGroupName" paramater to race board link in
...
news entries
2015-11-10 15:14:08 +01:00
Benjamin Barth
15451b93a7
bug2337: Added "leaderboardGroupName" paramater to race board link in
...
race views (list and competition format)
2015-11-10 15:11:56 +01:00
Benjamin Barth
b7d11f0c03
bug2337: Added leaderboardgroup name info to SimpleRaceMetadataDTO
2015-11-10 15:03:49 +01:00
Benjamin Barth
fa2ba9963b
Removed unused method from EventView
2015-11-10 14:43:02 +01:00
Axel Uhl
01e7ca77b3
Merge branch 'master' into bug3350
2015-11-10 14:29:57 +01:00
Benjamin Barth
7e86c6af40
Used common DateUtil class to calculate if start time or start date of
...
race is shown competition format
2015-11-10 14:12:14 +01:00
Benjamin Barth
e2ad480b59
Fixed DateUtil isSame... method calculations
2015-11-10 14:11:07 +01:00
Benjamin Barth
366287450e
Adjusted logic when start time or start date of a race is shown in
...
competition format
2015-11-10 13:34:30 +01:00
Benjamin Barth
e6381989bb
Used short time format to render start time of races (list view and
...
competition format)
2015-11-10 13:27:49 +01:00
Axel Uhl
fmittag
Benjamin Barth
Steffen Schaefer