 Axel Uhl
|
92fd6537ff
|
Merge branch 'master' into dev
|
2013-01-29 19:06:58 +01:00 |
|
|
Axel Uhl
|
3c46380a94
|
Merge branch 'master' into dev
|
2013-01-29 16:44:34 +01:00 |
|
|
Axel Uhl
|
60ef75fecc
|
Merge branch 'master' into dev
|
2013-01-29 01:39:22 +01:00 |
|
|
Axel Uhl
|
42a730436e
|
also support mass-remove in one round-trip
|
2013-01-29 01:38:58 +01:00 |
|
|
Axel Uhl
|
e8d537993d
|
Merge branch 'master' into dev
|
2013-01-29 01:29:22 +01:00 |
|
|
Axel Uhl
|
4939086c0b
|
also made stopping tracking multi-selection aware
|
2013-01-29 01:26:35 +01:00 |
|
|
Axel Uhl
|
61728d53a2
|
made start-tracking service APIs multi-race capable
|
2013-01-29 00:53:22 +01:00 |
|
|
Axel Uhl
|
318121c441
|
added hamcrest as bundle dependency to gwt.ui.test to make maven build succeed
|
2013-01-29 00:37:12 +01:00 |
|
|
Axel Uhl
|
75c83680a5
|
Merge branch 'master' into dev
|
2013-01-28 21:16:18 +01:00 |
|
|
Axel Uhl
|
817c16879b
|
adjusted GWT compile settings for new entry points; added no-proxy selenium test launch
|
2013-01-28 21:06:38 +01:00 |
|
|
Axel Uhl
|
de4fad90ad
|
Merge branch 'master' into dev
|
2013-01-28 18:06:38 +01:00 |
|
|
Axel Uhl
|
eff4152c1a
|
Merge remote-tracking branch 'origin/master'
|
2013-01-28 18:00:27 +01:00 |
|
|
Axel Uhl
|
9346ea9a69
|
Merge remote-tracking branch 'server/master'
|
2013-01-28 17:58:12 +01:00 |
|
|
Axel Uhl
|
3e950c86b8
|
let SmartFutureCache suspend/resume so it doesn't produce unlimited numbers of tasks in queue; see also bug 1175
|
2013-01-28 17:54:21 +01:00 |
|
|
Axel Uhl
|
d77e41c2ee
|
Merge branch 'master' into dev
|
2013-01-27 00:40:31 +01:00 |
|
|
Axel Uhl
|
2c680f8984
|
also apply latest tracking status to new races added to the TracTracRaceTrackerImpl
|
2013-01-27 00:38:41 +01:00 |
|
|
Axel Uhl
|
38539d22f6
|
Merge branch 'master' into dev
|
2013-01-26 20:28:26 +01:00 |
|
|
Axel Uhl
|
25354ae735
|
extracted TrackedRaceStatusEnum and added a column showing the status in TrackedRacesListComposite
|
2013-01-26 20:13:22 +01:00 |
|
|
Axel Uhl
|
d5bf459bc8
|
Merge branch 'master' into dev
|
2013-01-26 19:09:59 +01:00 |
|
|
Axel Uhl
|
548c80836e
|
added waitUntilNotLoading to TrackedRace and use it in the expensive caches to avoid recomputatoins during loading phase
|
2013-01-26 18:00:42 +01:00 |
|
|
Axel Uhl
|
4a580983d5
|
introduced TrackedRaceStatus as first step towards addressing bug 1175; replication of status updates already supported
|
2013-01-26 14:58:33 +01:00 |
|
|
Axel Uhl
|
f73409e1bd
|
Merge branch 'master' into dev
|
2013-01-26 01:13:02 +01:00 |
|
|
Axel Uhl
|
b2e3db25a8
|
improved thread pool management: use ThreadPoolExecutor such that it terminates threads if they aren't used in a while
|
2013-01-26 01:11:24 +01:00 |
|
|
Axel Uhl
|
81b86dcdb9
|
Merge branch 'master' into dev
|
2013-01-25 22:56:34 +01:00 |
|
|
Axel Uhl
|
0a1e0f13fb
|
enhanced query for leaderboards not in a group to exclude overall leaderboards
|
2013-01-25 22:07:24 +01:00 |
|
|
Axel Uhl
|
008aeda0e6
|
adjusted tooltips
|
2013-01-25 21:18:42 +01:00 |
|
|
Axel Uhl
|
ceff464ecb
|
Merge remote-tracking branch 'origin/master'
|
2013-01-25 17:51:46 +01:00 |
|
|
Axel Uhl
|
2dbcf951ea
|
Merge branch 'master' into dev
|
2013-01-25 11:06:07 +01:00 |
|
|
Axel Uhl
|
9aba83b0f9
|
Merge remote-tracking branch 'origin/master'
|
2013-01-25 10:55:11 +01:00 |
|
|
Axel Uhl
|
633741aaa5
|
Merge branch 'master' into dev
|
2013-01-24 23:12:22 +01:00 |
|
|
Axel Uhl
|
6c4b25adf0
|
Merge remote-tracking branch 'server/master'
|
2013-01-23 21:16:31 +01:00 |
|
|
Axel Uhl
|
e918cab670
|
added the new media/video gwt modules to the GWT compiler settings
|
2013-01-23 15:55:44 +01:00 |
|
|
Axel Uhl
|
8d2fc6803b
|
fixed leg time issue in Xcelsius / BOBJ adapter
|
2013-01-23 15:25:56 +01:00 |
|
|
Axel Uhl
|
ff4425e9d9
|
fixed merge problem
|
2013-01-23 12:48:59 +01:00 |
|
|
Axel Uhl
|
923f633a5e
|
Merge remote-tracking branch 'origin/master'
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
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
|
2013-01-23 11:51:38 +01:00 |
|
|
Axel Uhl
|
51ce9b70e2
|
Merge branch 'master' into dev
|
2013-01-22 19:49:50 +01:00 |
|
|
Axel Uhl
|
d04b195a9c
|
Merge remote-tracking branch 'server/master'
|
2013-01-22 19:47:47 +01:00 |
|
|
Axel Uhl
|
d9a94a153c
|
added formatting / messages for new high point scoring scheme variant
|
2013-01-22 10:41:51 +01:00 |
|
|
Axel Uhl
|
128d554698
|
added a variant of the HighPoint scoring system that awards the winner 10 points; needed for the 2013 ESS
|
2013-01-22 10:16:24 +01:00 |
|
|
Axel Uhl
|
14b43313d5
|
Merge branch 'master' into dev
|
2013-01-18 23:08:35 +01:00 |
|
|
Axel Uhl
|
66ff48f709
|
whitespace change only
|
2013-01-18 23:07:31 +01:00 |
|
|
Axel Uhl
|
e717d3ba91
|
Merge branch 'master' into dev
|
2013-01-18 21:24:09 +01:00 |
|
|
Axel Uhl
|
c00efd6bf4
|
fixed more places where DateFormat's hh was used instead of HH
|
2013-01-18 19:31:34 +01:00 |
|
|
Axel Uhl
|
9cd5be81da
|
fixing bug 1151 by fixing the simple date format pattern for parsing UTC strings
|
2013-01-18 18:12:30 +01:00 |
|
|
Axel Uhl
|
c1c2885b02
|
avoid empty virtual wind tracks for SwissTiming races as they don't have a startOfTracking/endOfTracking marker
|
2013-01-18 17:39:37 +01:00 |
|
|
Axel Uhl
|
532ccddf73
|
Merge remote-tracking branch 'origin/master'
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
|
2013-01-18 14:09:56 +01:00 |
|
|
Axel Uhl
|
2c9878d08f
|
Merge remote-tracking branch 'server/master'
|
2013-01-18 14:09:31 +01:00 |
|
|
Axel Uhl
|
a47329eb95
|
fix for bug 1151: use end of race instead of end of tracking, and end of tracking only as a default
|
2013-01-18 13:35:36 +01:00 |
|
|
Axel Uhl
|
f04ce326b3
|
added another bin/ directory to .gitignore
|
2013-01-18 13:10:16 +01:00 |
|
|
Axel Uhl
|
dc159cbf3f
|
Merge branch 'master' into dev
|
2013-01-15 17:34:06 +01:00 |
|
|
Axel Uhl
|
8bb24c8f74
|
fixing bug 1149: changing the result discarding rules invalidates the leaderboard DTO cache
|
2013-01-15 17:31:27 +01:00 |
|
|
Axel Uhl
|
e5d3d34787
|
Merge remote-tracking branch 'server/master'
|
2013-01-15 16:58:19 +01:00 |
|
|
Axel Uhl
|
ebdc314f66
|
use alphabetically-sorted regatta list in drop-down
|
2013-01-15 16:46:53 +01:00 |
|
|
Axel Uhl
|
bcc7846cba
|
factored regatta list box and regatta list out
|
2013-01-15 16:26:26 +01:00 |
|
|
Axel Uhl
|
f41825f451
|
Merge branch 'master' into dev
|
2013-01-15 11:09:57 +01:00 |
|
|
Axel Uhl
|
1b000ff5a4
|
improved logging for NoWindException during future execution; don't try to store null mark position from clientparams.php
|
2013-01-15 11:09:00 +01:00 |
|
|
Axel Uhl
|
67f9ff3b10
|
Merge branch 'master' into dev
|
2013-01-15 08:27:04 +01:00 |
|
|
Axel Uhl
|
b8cbc8c3c6
|
switched gwt-maven-plugin to version 2.5.0
|
2013-01-15 08:24:44 +01:00 |
|
|
Axel Uhl
|
c52c8b1b21
|
fixed pom.xml after merge
|
2013-01-15 07:47:19 +01:00 |
|
|
Axel Uhl
|
7d04eefb43
|
Merge branch 'master' into dev
|
2013-01-15 07:46:05 +01:00 |
|
|
Axel Uhl
|
a1e185430f
|
fixed formatting
|
2013-01-15 07:45:41 +01:00 |
|
|
Axel Uhl
|
ee9b2e80dd
|
Merge branch 'master' into dev
|
2013-01-15 07:22:15 +01:00 |
|
|
Axel Uhl
|
5419fb8e96
|
adjusted launch configuration for changed tunnel IP
|
2013-01-14 16:59:22 +01:00 |
|
|
Axel Uhl
|
76d87f1204
|
Merge branch 'master' into dev
|
2013-01-14 16:24:06 +01:00 |
|
|
Axel Uhl
|
caf493c65f
|
in the replication tests, wait for the servlet emulation to have started listening on the server socket before continuing
|
2013-01-14 16:23:05 +01:00 |
|
|
Axel Uhl
|
339941dae0
|
updated documentation about running a build regarding profiles and settings.xml
|
2013-01-14 16:04:21 +01:00 |
|
|
Axel Uhl
|
8372987dec
|
Merge branch 'master' into dev
|
2013-01-14 15:56:09 +01:00 |
|
|
Axel Uhl
|
4a28f28e25
|
fixed tests which relied on timing aspects of the SentenceReader which changed
|
2013-01-14 15:55:43 +01:00 |
|
|
Axel Uhl
|
b2ed05ac7c
|
Merge branch 'master' into dev
|
2013-01-14 14:15:24 +01:00 |
|
|
Axel Uhl
|
1736bf3446
|
made TrackedRaceReplicationTest robust against exceptions in setUp by a null check in tearDown
|
2013-01-14 14:14:25 +01:00 |
|
|
Axel Uhl
|
ad0e9bc69f
|
print exception stack traces before calling tearDown in case a setUp routine for a replication test fails for an exception
|
2013-01-14 14:09:03 +01:00 |
|
|
Axel Uhl
|
a48b900d28
|
Merge branch 'master' into dev
|
2013-01-14 13:23:46 +01:00 |
|
|
Axel Uhl
|
c2a14de734
|
removed CR (carriage return) characters from windvane.nmea test file
|
2013-01-14 13:22:45 +01:00 |
|
|
Axel Uhl
|
94faa7c448
|
Merge remote-tracking branch 'server/master'
|
2013-01-14 13:14:20 +01:00 |
|
|
Axel Uhl
|
d6b41f05a6
|
apply a waiting sleep in the NMEA SentenceReader only if the underlying stream is not ready()
|
2013-01-14 13:11:37 +01:00 |
|
|
Axel Uhl
|
01c42c1b87
|
avoid resource warnings
|
2013-01-14 10:47:31 +01:00 |
|
|
Axel Uhl
|
c2b50b288c
|
Merge branch 'gwt25'
|
2013-01-11 16:49:30 +01:00 |
|
|
Axel Uhl
|
b5b229af1e
|
Merge remote-tracking branch 'origin/gwt25' into gwt25
|
2013-01-11 16:43:13 +01:00 |
|
|
Axel Uhl
|
14f1d2f884
|
Merge branch 'master' into dev
|
2013-01-11 15:14:39 +01:00 |
|
|
Axel Uhl
|
293ee59673
|
whitespace change
|
2013-01-10 20:01:55 +01:00 |
|
|
Axel Uhl
|
d6c2baae96
|
removed proxy settings from Maven settings.xml on dev branch which is meant for building outside of the SAP VPN
|
2013-01-10 07:25:22 +01:00 |
|
|
Axel Uhl
|
65cfe7c3bb
|
Merge branch 'master' into dev
Conflicts:
java/pom.xml
|
2013-01-10 07:24:02 +01:00 |
|
|
Axel Uhl
|
b53bddae53
|
adjusted formatting in Maven settings.xml
|
2013-01-10 07:23:08 +01:00 |
|
|
Axel Uhl
|
025f9886e8
|
Merge branch 'integration_tests'
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/util/CourseAsWaypointList.java
|
2013-01-10 07:22:26 +01:00 |
|
|
Axel Uhl
|
29d2f62d76
|
added a launch config for TracTrac tests
|
2013-01-10 07:21:44 +01:00 |
|
|
Axel Uhl
|
d7c562eced
|
added SwissTiming test resources
|
2013-01-10 07:19:33 +01:00 |
|
|
Axel Uhl
|
b427609ee5
|
fixed javadoc typo
|
2013-01-10 07:15:48 +01:00 |
|
|
Axel Uhl
|
be5d8aa7a3
|
Merge branch 'master' into integration_tests
|
2013-01-09 23:10:26 +01:00 |
|
|
Axel Uhl
|
7e642a1fb4
|
Merge branch 'master' into dev
|
2013-01-09 22:44:01 +01:00 |
|
|
Axel Uhl
|
000f0d448f
|
Merge branch 'master' into gwt25
|
2013-01-09 20:57:44 +01:00 |
|
|
Axel Uhl
|
5bda9263b9
|
adjust boat class names as listed in SwissTiming JSON file to those in DomainFactory
|
2013-01-09 20:52:38 +01:00 |
|
|
Axel Uhl
|
dcd27ccd79
|
don't thrown an exception in SailMasterConnectorImpl for message types that shall not trigger a notifyListeners...
|
2013-01-09 17:57:24 +01:00 |
|
|
Axel Uhl
|
211d1f9844
|
Merge branch 'master' into gwt25
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
|
2013-01-09 17:16:07 +01:00 |
|
|
Axel Uhl
|
4388f07d7e
|
propagate regatta into SwissTimingReplayToDomainAdapter instead of always creating a new default regatta
|
2013-01-09 16:53:38 +01:00 |
|
|
Axel Uhl
|
9a267c57c6
|
Fixed port for local selenium testing; fixed IP of central test MongoDB
|
2013-01-09 16:12:29 +01:00 |
|
|
Axel Uhl
|
3b9bc40dcc
|
eliminated a few warnings
|
2013-01-09 12:10:34 +01:00 |
|
|
Axel Uhl
|
7cc977f0ad
|
Merge branch 'master' into integration_tests
Conflicts:
java/.gitignore
java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
|
2013-01-09 09:35:57 +01:00 |
|
|
Axel Uhl
|
89c98c7f19
|
Merge remote-tracking branch 'origin/master'
|
2013-01-09 09:31:33 +01:00 |
|
|
Axel Uhl
|
8172d8bdba
|
Merge branch 'master' into dev
|
2013-01-08 20:49:43 +01:00 |
|
|
Axel Uhl
|
bb7e39165d
|
made getInstance() synchronized on SentenceFactory which avoids a race condition during factory initialization
|
2013-01-08 20:48:42 +01:00 |
|