 Axel Uhl
|
45fec992db
|
Merge branch 'master' into bug1351
|
2013-06-20 14:08:57 +02:00 |
|
 fmittag
|
dbe15e3618
|
removed URL to manage2sail test system from result importer
|
2013-06-20 11:13:08 +02:00 |
|
|
Axel Uhl
|
213cf8ef26
|
added postrace HTML stuff to build.properties
|
2013-06-20 09:24:10 +02:00 |
|
|
Axel Uhl
|
01518b5e77
|
added post-race analysis explanation as static HTML and images to www bundle
|
2013-06-20 09:23:18 +02:00 |
|
|
Axel Uhl
|
cfee0965ac
|
Merge remote-tracking branch 'server/master'
|
2013-06-19 23:02:12 +02:00 |
|
|
Axel Uhl
|
0c6d7cfcc2
|
Merge remote-tracking branch 'server/racecommittee_app'
|
2013-06-19 23:00:13 +02:00 |
|
|
fmittag
|
341b64c037
|
fixed a bug with rendering of regatta structure in LeaderboardGroupPanel when fleets have the same name (e.g. Default) in all series
|
2013-06-19 18:28:33 +02:00 |
|
|
Axel Uhl
|
e0c09ea415
|
Merge remote-tracking branch 'server/master'
|
2013-06-19 18:18:17 +02:00 |
|
|
Axel Uhl
|
16ad3455d1
|
also invalidate the start time if the pass is changed
|
2013-06-19 18:16:14 +02:00 |
|
|
Axel Uhl
|
202bfcd5da
|
fixed invalidation of start time also for detaching the log and for re-setting the start time
|
2013-06-19 18:15:03 +02:00 |
|
 Armin Zamani
|
584982bd03
|
Regatta overview: Store the regatta overview settings per event
|
2013-06-19 15:57:27 +02:00 |
|
|
Armin Zamani
|
e48c3ca8a2
|
Removed comparator for Regatta overview since the order of course areas, regattas, series, fleets is given by the domain lists
|
2013-06-19 15:29:15 +02:00 |
|
|
Armin Zamani
|
c5f33e7cc2
|
removed FlagAlphabetInterpreter in com.sap.sailing.server.gateway
|
2013-06-19 14:42:06 +02:00 |
|
 Marcus Kammer
|
7bcb9b92f1
|
Change CSS for better support of older Browsers. Add normalize.css for better css reset.
|
2013-06-19 14:41:14 +02:00 |
|
|
Armin Zamani
|
f254abdab3
|
Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app
|
2013-06-19 14:40:04 +02:00 |
|
|
Axel Uhl
|
7037970fe1
|
Merge branch 'master' into bug1351
|
2013-06-19 13:51:38 +02:00 |
|
|
Axel Uhl
|
5ad4359a45
|
Merge remote-tracking branch 'origin/master'
|
2013-06-19 13:51:23 +02:00 |
|
|
Axel Uhl
|
90b4ce4e53
|
Merge remote-tracking branch 'origin/master' into bug1351
|
2013-06-19 13:51:16 +02:00 |
|
 Christopher Ronnewinkel (D036654)
|
8b969da6ba
|
fix time-slider updating of ticks & labels;
|
2013-06-19 13:41:07 +02:00 |
|
|
Axel Uhl
|
264ce8c33c
|
Merge branch 'master' into bug1351
|
2013-06-19 13:30:02 +02:00 |
|
|
Axel Uhl
|
612a3befb4
|
added gen/ and bin/ to .gitignore for RCapp
|
2013-06-19 13:12:28 +02:00 |
|
|
Armin Zamani
|
1fd0b0794c
|
Merge branch 'racecommittee_regattaoverview' into racecommittee_app
|
2013-06-19 12:57:57 +02:00 |
|
|
Armin Zamani
|
5d81747aa8
|
added javadoc for SailingServiceImpl.getRegattaNameFromLeaderboard()
|
2013-06-19 12:53:03 +02:00 |
|
|
Axel Uhl
|
2295869c0d
|
use service's base domain factory instead of constant
|
2013-06-19 12:12:33 +02:00 |
|
|
Armin Zamani
|
581687df44
|
improved the RegattaRaceStatesComparator to consider the ordering of series
|
2013-06-19 12:12:32 +02:00 |
|
|
Axel Uhl
|
2cacb7856c
|
Merge branch 'master' into racecommittee_app
|
2013-06-19 10:17:37 +02:00 |
|
|
Axel Uhl
|
92221bfeb3
|
Merge remote-tracking branch 'origin/master'
|
2013-06-19 10:01:36 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
cde2062794
|
Merge remote-tracking branch 'origin/simulator_dev'
|
2013-06-19 09:50:48 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
043f3c012d
|
fix unwanted stops of replay after cached refresh;
|
2013-06-19 09:49:12 +02:00 |
|
|
Axel Uhl
|
1e0c1acb52
|
Merge branch 'master' into racecommittee_app
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
|
2013-06-19 09:32:46 +02:00 |
|
|
Axel Uhl
|
d58cf9f7da
|
Merge branch 'master' into bug1351
|
2013-06-19 09:27:59 +02:00 |
|
|
Axel Uhl
|
091b2ad718
|
removed unused code to avoid warnings
|
2013-06-19 09:22:59 +02:00 |
|
|
Axel Uhl
|
8b735fd542
|
Merge branch 'master' into xc_dev
|
2013-06-19 08:45:47 +02:00 |
|
|
Armin Zamani
|
f576b240fb
|
removed unused code and unnecessary comments in regatta overview code
|
2013-06-18 22:58:52 +02:00 |
|
|
Axel Uhl
|
c9a432ffcc
|
Merge branch 'master' into bug1351
|
2013-06-18 22:33:16 +02:00 |
|
|
Axel Uhl
|
b24bd7b869
|
Merge branch 'nondiscardablecarryforward'
|
2013-06-18 22:31:49 +02:00 |
|
|
Axel Uhl
|
4c726c4b88
|
fixed NPE for leaderboard loading with null discard thresholds; made comparison of discard thresholds null-safe
|
2013-06-18 22:30:57 +02:00 |
|
|
Axel Uhl
|
3f808fd5d3
|
fire a race column change event if a series' discarding rule changes
|
2013-06-18 22:23:35 +02:00 |
|
|
Axel Uhl
|
e2b95b4fb9
|
fixed problem with editing n/a field
|
2013-06-18 22:23:13 +02:00 |
|
|
Axel Uhl
|
0930688ae1
|
added hashCode/equals for result discarding rule
|
2013-06-18 22:22:50 +02:00 |
|
|
Axel Uhl
|
4cb6cd6b9a
|
whitespace and comment changes only
|
2013-06-18 21:45:47 +02:00 |
|
|
Axel Uhl
|
984dd3ef3f
|
also forward firstColumnIsNonDiscardableCarryForward value from regatta/series creation dialog
|
2013-06-18 21:26:14 +02:00 |
|
|
fmittag
|
6ae9dab196
|
fixed two little bugs with loading and storing of 'isFirstColumnIsNonDiscardableCarryForward' in a regatta series
|
2013-06-18 19:25:49 +02:00 |
|
|
Armin Zamani
|
0a052491de
|
Merge branch 'master' into racecommittee_app
|
2013-06-18 18:36:57 +02:00 |
|
|
Armin Zamani
|
8e427c378e
|
Merge branch 'racecommittee_regattaoverview' into racecommittee_app
|
2013-06-18 18:31:52 +02:00 |
|
|
Axel Uhl
|
ef45f45c9c
|
added firstColumnIsNonDiscardableCarryForward to Series with all ramifications
|
2013-06-18 18:11:08 +02:00 |
|
|
Armin Zamani
|
0ed28673aa
|
Bug fix: Serializer threw an exception old confirmation events where the positioning was not set
|
2013-06-18 17:23:41 +02:00 |
|
|
fmittag
|
f4efd5e7ae
|
Merge remote-tracking branch 'origin/leaderboard_json_with_max_competitors'
|
2013-06-18 17:17:50 +02:00 |
|
|
fmittag
|
17cbf6bf65
|
Merge remote-tracking branch 'origin/master' into leaderboard_json_with_max_competitors
|
2013-06-18 17:16:26 +02:00 |
|
|
fmittag
|
f333a33f75
|
extended the test for limitation of competitors in the leaderboard json export
|
2013-06-18 17:02:31 +02:00 |
|