Steffen Schaefer
5cc6d15184
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-25 08:41:04 +01:00
Axel Uhl
e6ee44088a
another minor formatting change
2015-11-24 22:53:02 +01:00
Axel Uhl
6beea14c7d
minor formatting changes
2015-11-24 22:51:27 +01:00
Axel Uhl
df1c386a37
Merge branch 'master' into bug3212
2015-11-24 22:32:52 +01:00
Axel Uhl
5e85738d7d
removed version specificity for a few bundles required by gwt.ui
2015-11-24 22:30:44 +01:00
Axel Uhl
95680b6d40
Merge branch 'master' into bug3377
2015-11-24 22:16:24 +01:00
Steffen Schaefer
0ae8f80202
Merge remote-tracking branch 'origin/master' into
...
android-maven-build-bug3190
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
2015-11-24 17:45:48 +01:00
Steffen Schaefer
92b6455ab2
Removed locally declared Maven repository because the gwt-bootstrap
...
artifact that used to come from the repository is now available on Maven
central repository that is implicitly used by Maven
2015-11-24 17:26:41 +01:00
Steffen Schaefer
88c1ff71ac
Using ${project.version} for intra-project dependencies (source deps in
...
GWT projects) instead of hardcoded versions. This results in no diff for
the release branch because it automatically works when changing the
modules' declared versions.
2015-11-24 15:28:50 +01:00
Jan Broß
3bb3ea1974
Fixes bug 3212: resolve mark position via RacingEventService
2015-11-24 11:55:35 +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
Steffen Schaefer
69054601dd
Added @GwtIncompatible to RaceCompetitorNewsEntryDTO constructor that
...
sould only called in server code
2015-11-24 11:10:42 +01:00
Steffen Schaefer
9d9d485662
Using ImageDTO and VideoDTO instead of the Sailing* sublcasses to make
...
several entry point modules compile without having the Sailing* classes
on the classpath
2015-11-24 11:10:36 +01:00
Steffen Schaefer
169301db27
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-23 08:38:24 +01:00
Jan Broß
05032501ba
Fixes bug3368
2015-11-21 17:02:28 +01:00
Axel Uhl
1465295580
removed duplicate string message entries (thanks to Albert Kwiatkowski for his review)
2015-11-20 16:00:51 +01:00
Axel Uhl
36801cc550
coding conventions; improved testCompetitorCreation by also checking sail ID and boat class for equality
2015-11-20 10:07:11 +01:00
Axel Uhl
a646f707b8
Merge branch 'master' into failingTestbug3367
2015-11-20 09:43:40 +01:00
Axel Uhl
cf777812c5
don't search for race column in EditMarkPassingsPanel each time the leaderboard is updated; do this only on demand
2015-11-20 01:36:19 +01:00
Lukas Furmanek
7151d8a0dc
Merge branch 'bug3367' into failingTestbug3367
2015-11-19 16:28:50 +01:00
Lukas Furmanek
82a5368c32
new testcase for competitorcreation
2015-11-19 16:24:45 +01:00
Steffen Schaefer
26597b3de8
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-19 14:24:18 +01:00
Papick Garcia Taboada
0571a6dd1b
Enabled time panel toggle
2015-11-18 15:44:11 +01:00
Steffen Schaefer
d5cee47fb3
Merge branch 'master' into android-maven-build-bug3190
2015-11-18 14:54:01 +01:00
Papick Garcia Taboada
a90003a4ef
Implemented toggle functionality for time panel in simulator panel. Disabled by setting toggle button invisible.
2015-11-18 14:52:22 +01:00
Steffen Schaefer
fc6c045c20
Fixed the paddings of the scrollable leaderboards embedded in Home
2015-11-18 12:54:22 +01:00
Steffen Schaefer
b46ddb9255
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-18 10:45:43 +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
Steffen Schaefer
ae919d7a31
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-16 11:53:37 +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
Steffen Schaefer
5852cdb4fa
Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190
2015-11-16 08:25:38 +01:00
Lennart Hensler
bd2d67f346
Merge remote-tracking branch 'origin/master' into dataMining
2015-11-15 11:43:12 +01:00
Axel Uhl
d79018c4d1
fixed typo in StringMessage
2015-11-14 02:24:42 +01:00
Axel Uhl
664489ad6b
fixed message properties parameter number
2015-11-13 18:38:40 +01:00
Axel Uhl
793194fe9e
Merge branch 'master' into android-maven-build-bug3190
2015-11-13 16:50:16 +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
Steffen Schaefer
Axel Uhl
Jan Broß
Lukas Furmanek
Papick Garcia Taboada
Lennart Hensler