Axel Uhl
d96978ef92
fixed RegattaImpl.getAllCompetitors() such that it not only considers RaceDefinitions owned by the regatta but also all TrackedRaces linked to the regatta's columns
2015-02-11 17:34:51 +01:00
Axel Uhl
325d308482
simplified implementation of CompetitorImpl.hasEmail()
2015-02-11 16:26:07 +01:00
Axel Uhl
fe75e7899d
simplified CompetitorDTOImpl.hasEmail()
2015-02-11 15:54:26 +01:00
Axel Uhl
40f0ac5bbd
RegattaLeaderboard.getAllCompetitors() now directly delegates to Regatta.getAllCompetitors() because it does the same thing
2015-02-11 15:47:22 +01:00
Axel Uhl
67d1444466
Merge branch 'master' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
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.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/pom.xml
2015-02-11 14:55:30 +01:00
Axel Uhl
2beba1f5d1
Merge remote-tracking branch 'server/master'
2015-02-11 14:48:06 +01:00
Fredrik Teschke
b9c6fea20e
adapt selenium test to match new behaviour of RegattaLeaderboard#getAllCompetitors()
...
- test expected leaderboard to contain no competitors before linking tracked races
- however, the Regatta underlying the leaderboard already new the competitors
- with the new implementation, a RegattaLeaderboard also uses the competitors known to the regatta
2015-02-11 14:31:54 +01:00
Fredrik Teschke
3875409363
remove unused class that was added for email invites
2015-02-11 13:44:42 +01:00
Fredrik Teschke
8bfc064c5d
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
2015-02-11 13:17:51 +01:00
Fredrik Teschke
a5507a16b3
remove unnecessary mockito dependency that let build fail
2015-02-11 13:16:47 +01:00
Axel Uhl
6e6a49467f
added release notes entry for nnew "Start delay" leaderboard column
2015-02-11 12:04:49 +01:00
Fredrik Teschke
0c284eed0b
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms'
2015-02-11 11:55:39 +01:00
Axel Uhl
bc3437892e
added column to leaderboard showing the time since race start in seconds
2015-02-11 11:45:50 +01:00
Axel Uhl
5e4a77cf28
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2015-02-11 11:06:51 +01:00
Axel Uhl
eb3cf53352
made getReplicationService() protected again on SailingServiceImpl because it's overridden in SailingServiceImplMock
2015-02-11 10:28:03 +01:00
Axel Uhl
518b86651e
made SailingServiceImpl.getFileStorageService() private again
2015-02-11 10:23:51 +01:00
Axel Uhl
ea7d158b0b
made SailingServiceImpl.getDeviceIdentifierStringSerializerHandlerFinder(...) private again
2015-02-11 10:22:43 +01:00
Axel Uhl
b2cbc90102
made SailingServiceImpl.getReplicationService() private again
2015-02-11 10:20:50 +01:00
Axel Uhl
d91257c8d6
Merge branch 'master' into ftes-mail-move-to-sse
2015-02-11 10:04:01 +01:00
Axel Uhl
120bef131e
activated obfuscation again, hoping that the "wait for PENDING_AJAX_CALLS" cuts it
2015-02-11 08:52:33 +01:00
Axel Uhl
f807849f2a
wait for PENDING_AJAX_CALLS to appear, catching and logging exception when it's not yet there, then continue to wait
2015-02-11 08:51:43 +01:00
Axel Uhl
6c413b7afe
generate PRETTY GWT output for gwt.ui for now; does this impact Selenium test cases and the availability of the PENDING_AJAX_CALLS variable?
2015-02-11 08:35:37 +01:00
Axel Uhl
1632e7d37c
trying again with PRETTY GWT output; does this really affect the PENDING_AJAX_CALLS variable's availability?
2015-02-11 08:33:26 +01:00
Axel Uhl
fffb06c7f2
re-enable obfuscation for gwt.ui GWT compile
2015-02-10 23:36:33 +01:00
Axel Uhl
6cd449928b
fixed winddbTest launch configs, re-enabling the accidentally disabled gateway.testsupport bundle as auto-start
2015-02-10 23:32:32 +01:00
Axel Uhl
d66bbda63b
export org.json from org.openqa.selenium.osgi bundle
2015-02-10 23:29:56 +01:00
Axel Uhl
8646840cec
harmonized launch configurations
2015-02-10 23:17:35 +01:00
Axel Uhl
b728d2f85a
export org.json from org.openqa.selenium.osgi bundle
2015-02-10 22:34:08 +01:00
Fredrik Teschke
0ca216eda6
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
2015-02-10 16:03:40 +01:00
Axel Uhl
f3f1c90417
Merge branch 'master' into ribdashboard
2015-02-10 16:02:52 +01:00
Fredrik Teschke
6ea9a7f06f
Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse
2015-02-10 16:02:01 +01:00
Axel Uhl
69e29365f8
fixing bug 2643 by making result comparison more intelligent
2015-02-10 16:01:08 +01:00
Axel Uhl
7ac80d71e3
Merge branch 'master' into ribdashboard; introduced gwt.workers property in maven build
...
Conflicts:
configuration/buildAndUpdateProduct.sh
2015-02-10 15:27:01 +01:00
Axel Uhl
4e55e61c51
fixed merge problems in launch configs, adding file storage bundle everywhere
2015-02-10 14:37:41 +01:00
Axel Uhl
66d8b8fc4d
added gwtbootstrap Maven dependency to dashboards project
2015-02-10 14:28:00 +01:00
Axel Uhl
bcac803264
re-add WEB-INF/classes to .gitignore so only .dummy file will be checked out
2015-02-10 14:19:04 +01:00
Axel Uhl
cf58c8babf
re-formatted dashboard pom.xml files; introduced .dummy file in WEB-INF/classes to ensure directory is there after check-out
2015-02-10 14:18:28 +01:00
Axel Uhl
cc4d9e320e
re-formatted java/pom.xml
2015-02-10 14:14:08 +01:00
Axel Uhl
012ed3b242
added filestorage bundle to feature.xml (probably resolving an ill-resolved merge conflict)
2015-02-10 13:50:45 +01:00
Axel Uhl
2af95c003c
added inherits for AdminConsole.gwt.xml
2015-02-10 13:40:46 +01:00
Axel Uhl
96f27612aa
Merge branch 'master' into ribdashboard
2015-02-10 13:22:06 +01:00
Axel Uhl
4694814938
avoid NPE after de-serializing a TrackedRaceImpl by moving shortTimeWindCache creation to the front of readObject(...)
2015-02-10 13:21:03 +01:00
Axel Uhl
1ed846859c
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-10 13:00:48 +01:00
Axel Uhl
34873bb0eb
Merge remote-tracking branch 'server/master'
2015-02-10 12:40:17 +01:00
Axel Uhl
5ba401dbb1
exclude the currently defective com.sap.sse.gwt.test fragment from the build; we first need to fit it into the Maven environment properly
2015-02-10 12:38:40 +01:00
Simon Pamies
c699662075
Removed exclusion of a test in com.sap.sse.gwt
2015-02-10 06:56:54 +01:00
Fredrik Teschke
52fa52efce
choose complicated approach for encoding URLs, as tycho doesn't allow com.google.gwt references in common bundles
2015-02-10 03:36:05 +01:00
Fredrik Teschke
523ad4cc3e
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation
2015-02-10 03:10:29 +01:00
Fredrik Teschke
c861fcbd74
upgrade poms of shared and common bundles to 1.7 compiler level
2015-02-10 03:09:27 +01:00
Fredrik Teschke
4da7cfa6eb
reflection in URLEncode to avoid tycho compilation error
2015-02-10 03:06:32 +01:00