Armin Zamani
|
f4b79f237b
|
Merge branch 'master' into racecommittee_app
|
2013-07-23 10:42:49 +02:00 |
|
Armin Zamani
|
a599d4b9e9
|
Fixed the problem that commit ef4ec5516c intended to fix: When the user logs in as e.g. a demo user, logs out and tries to log in as Officer again, the login type is selected properly now. When no login type is selected by the user, the user cannot log onto the course area
|
2013-07-20 22:34:11 +02:00 |
|
Armin Zamani
|
6ed1ff331e
|
Merge branch 'master' into racecommittee_app
|
2013-07-19 22:59:13 +02:00 |
|
Armin Zamani
|
98d20345d5
|
Merge branch 'master' into racecommittee_app
|
2013-07-18 14:45:22 +02:00 |
|
Armin Zamani
|
4ce7b463b2
|
Merge branch 'master' into racecommittee_app
|
2013-07-17 12:18:33 +02:00 |
|
Armin Zamani
|
dbad878035
|
Removed additional getTimePoint() declaration in RaceLogEvent
|
2013-07-16 21:44:25 +02:00 |
|
Armin Zamani
|
ef7b049887
|
Merge branch 'master' into racecommittee_app
|
2013-07-16 20:31:02 +02:00 |
|
Armin Zamani
|
5fed0bfcb2
|
Merge branch 'master' into racecommittee_app
|
2013-07-16 00:46:22 +02:00 |
|
Armin Zamani
|
031b07946b
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-07 15:26:14 +02:00 |
|
Armin Zamani
|
992939a6e2
|
Merge branch 'master' into racecommittee_app
|
2013-07-07 15:25:32 +02:00 |
|
Armin Zamani
|
18a93bf409
|
App: Show mark images in the course designer known by the ESS race officers
|
2013-07-07 15:22:21 +02:00 |
|
Armin Zamani
|
ecf739b8dd
|
RegattaOverview: Implemented "Deselect all"/"Select all" button for settings. Note that deselecting all checkboxes and clicking on OK means to show all courseareas or regattas
|
2013-07-06 00:29:14 +02:00 |
|
Armin Zamani
|
47572a98f1
|
Bug fix after merge of StringMessages
|
2013-07-05 23:07:33 +02:00 |
|
Armin Zamani
|
8b4ee1b4e9
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-05 21:27:33 +02:00 |
|
Armin Zamani
|
b5b50680d2
|
Merge branch 'master' into racecommittee_app
|
2013-07-05 21:26:57 +02:00 |
|
Armin Zamani
|
4541bbe2b5
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-05 09:26:17 +02:00 |
|
Armin Zamani
|
78e0ccb84f
|
Merge branch 'master' into racecommittee_app
|
2013-07-05 09:25:49 +02:00 |
|
Armin Zamani
|
8af60a38ce
|
Merge branch 'racecommittee_app' into racecommittee_wind
Conflicts:
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-07-04 21:07:35 +02:00 |
|
Armin Zamani
|
05d1239b42
|
Merge branch 'master' into racecommittee_app
|
2013-07-04 21:05:51 +02:00 |
|
Armin Zamani
|
4aaa395c6c
|
Merge branch 'racecommittee_app' into racecommittee_wind
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-07-04 14:30:03 +02:00 |
|
Armin Zamani
|
08d74532ed
|
Merge branch 'master' into racecommittee_app
|
2013-07-04 14:27:42 +02:00 |
|
Armin Zamani
|
4b40d90fd0
|
Merge branch 'racecommittee_app' into racecommittee_wind
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-07-04 14:25:05 +02:00 |
|
Armin Zamani
|
fbdfc2799a
|
Merge branch 'master' into racecommittee_app
|
2013-07-04 09:36:56 +02:00 |
|
Armin Zamani
|
3a0862eefe
|
moved WindByRaceLogTest to com.sap.sailing.server.test, moved removing of wind fixes while detaching a TrackedRace from a RaceColumn to an own method
|
2013-07-03 19:33:30 +02:00 |
|
Armin Zamani
|
2162e94417
|
moved all strings in FlagsMeaningExplanator to StringMessages
|
2013-07-03 14:58:29 +02:00 |
|
Armin Zamani
|
9ba95416c2
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-03 13:55:08 +02:00 |
|
Armin Zamani
|
032b8a5381
|
Merge branch 'master' into racecommittee_app
|
2013-07-03 11:43:14 +02:00 |
|
Armin Zamani
|
1ff532de01
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-02 22:08:26 +02:00 |
|
Armin Zamani
|
72034625e3
|
Merge branch 'master' into racecommittee_app
|
2013-07-02 22:07:26 +02:00 |
|
Armin Zamani
|
ec0ffe3141
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-02 09:29:24 +02:00 |
|
Armin Zamani
|
b401c3ea03
|
Merge branch 'master' into racecommittee_app
|
2013-07-02 09:28:45 +02:00 |
|
Armin Zamani
|
f212539d54
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-07-01 17:25:33 +02:00 |
|
Armin Zamani
|
b96c897656
|
Merge branch 'master' into racecommittee_app
|
2013-07-01 17:22:34 +02:00 |
|
Armin Zamani
|
61299fb7bc
|
Added a test for the integration of Race Log Wind fixes in the WindStore (detaching test fails)
|
2013-07-01 17:20:07 +02:00 |
|
Armin Zamani
|
19fc14dab2
|
implemented windFixes finder test
|
2013-06-30 14:10:27 +02:00 |
|
Armin Zamani
|
88a60b8e1d
|
Fixed typo in finder test names
|
2013-06-30 14:09:55 +02:00 |
|
Armin Zamani
|
d8e546de5e
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-06-30 13:28:57 +02:00 |
|
Armin Zamani
|
986490e50d
|
code cleanup (removed two todos)
|
2013-06-30 13:27:38 +02:00 |
|
Armin Zamani
|
f5856466f6
|
Merge branch 'master' into racecommittee_app
|
2013-06-30 13:22:04 +02:00 |
|
Armin Zamani
|
8cba5d275c
|
Merge branch 'master' into racecommittee_app
|
2013-06-30 00:33:40 +02:00 |
|
Armin Zamani
|
7d01534075
|
Improved logging in app
|
2013-06-28 23:49:54 +02:00 |
|
Armin Zamani
|
20b7899d13
|
Gate Start: Only the class flag is removed at start time, the golf flag is removed seperately
|
2013-06-28 23:16:30 +02:00 |
|
Armin Zamani
|
de76498453
|
introduced a flags meaning explanator for the flags tool tip
|
2013-06-28 22:25:23 +02:00 |
|
Armin Zamani
|
a802234048
|
use recordWind instead of add of windTrack
|
2013-06-28 00:52:01 +02:00 |
|
Armin Zamani
|
314b12cbd7
|
Merge branch 'racecommittee_app' into racecommittee_wind
|
2013-06-27 23:13:07 +02:00 |
|
Armin Zamani
|
3526e7489f
|
changed race log event insertion logging to fine level
|
2013-06-27 18:35:41 +02:00 |
|
Armin Zamani
|
f9d7d50b8e
|
Merge branch 'master' into racecommittee_app
|
2013-06-27 18:21:29 +02:00 |
|
Armin Zamani
|
d64565018f
|
added logging when a race log event is inserted in database
|
2013-06-27 18:18:23 +02:00 |
|
Armin Zamani
|
b0f1b72667
|
adapted the course layout names for the international part of Kieler Woche 2013 according to sailing instructions for the course entry backup solution
|
2013-06-27 11:38:32 +02:00 |
|
Armin Zamani
|
4d02b07304
|
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-26 15:10:55 +02:00 |
|
Armin Zamani
|
a573ffb6fc
|
Merge branch 'master' into racecommittee_app
|
2013-06-26 11:41:03 +02:00 |
|
Armin Zamani
|
ac283bb75d
|
moved the resend interval for events to the AppConstants
|
2013-06-26 10:22:30 +02:00 |
|
Armin Zamani
|
2d8ebdf35a
|
First step towards wind store in TrackedRace for wind fixes by the racecommittee
|
2013-06-26 00:34:15 +02:00 |
|
Armin Zamani
|
f9584308fa
|
Merge branch 'master' into racecommittee_app
|
2013-06-25 18:31:30 +02:00 |
|
Armin Zamani
|
0eb1019210
|
RegattaOverview: added null check for event id for local storage of settings
|
2013-06-25 16:44:31 +02:00 |
|
Armin Zamani
|
9c3093636b
|
Merge branch 'master' into racecommittee_app
|
2013-06-25 16:22:11 +02:00 |
|
Armin Zamani
|
c72ffc5090
|
Merge branch 'master' into racecommittee_app
|
2013-06-25 13:11:03 +02:00 |
|
Armin Zamani
|
f7dda629a5
|
Merge branch 'master' into racecommittee_app
|
2013-06-25 10:58:31 +02:00 |
|
Armin Zamani
|
4fac255828
|
Merge branch 'master' into racecommittee_app
|
2013-06-24 22:14:20 +02:00 |
|
Armin Zamani
|
97dfbf8a2f
|
Merge branch 'racecommittee_app' into racecommittee_regattaoverview
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2013-06-24 16:04:24 +02:00 |
|
Armin Zamani
|
087f24d33d
|
Merge branch 'racecommittee_app' into racecommittee_kw13
|
2013-06-24 16:02:04 +02:00 |
|
Armin Zamani
|
b551d1faad
|
Merge branch 'master' into racecommittee_app
|
2013-06-24 16:01:24 +02:00 |
|
Armin Zamani
|
57f3644405
|
Merge branch 'racecommittee_app' into racecommittee_regattaoverview
|
2013-06-23 19:50:32 +02:00 |
|
Armin Zamani
|
1180a3050d
|
Merge branch 'master' into racecommittee_app
|
2013-06-23 19:48:05 +02:00 |
|
Armin Zamani
|
ebb26ab434
|
Merge branch 'racecommittee_app' into racecommittee_regattaoverview
|
2013-06-23 16:56:16 +02:00 |
|
Armin Zamani
|
fb12138f1e
|
Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app
|
2013-06-23 16:41:14 +02:00 |
|
Armin Zamani
|
b68ced6720
|
App: Adjusted finish time dialog style, improved error toast
|
2013-06-23 16:40:49 +02:00 |
|
Armin Zamani
|
35932a8a1e
|
Merge branch 'racecommittee_app' into racecommittee_regattaoverview
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/regattaoverview/RegattaRaceStatesComponent.java
|
2013-06-23 16:04:23 +02:00 |
|
Armin Zamani
|
1958b615be
|
Merge branch 'master' into racecommittee_app
|
2013-06-23 15:58:42 +02:00 |
|
Armin Zamani
|
4081a56da7
|
RegattaOverview: Improved tooltip (when no lower flag is shown)
|
2013-06-22 23:48:36 +02:00 |
|
Armin Zamani
|
a28007af88
|
RegattaOverview: the green circle is shown for finishing races
|
2013-06-22 23:39:13 +02:00 |
|
Armin Zamani
|
9dfd3e93e9
|
RegattaOverview: Shortened text in table
|
2013-06-22 23:38:49 +02:00 |
|
Armin Zamani
|
9f5dee08bd
|
RegattaOverview: Introduced Last update column
|
2013-06-22 23:38:24 +02:00 |
|
Armin Zamani
|
8a6eea70b4
|
RegattaOverview: unified upper flag, lower flag and direction arrow to one column
|
2013-06-22 23:37:40 +02:00 |
|
Armin Zamani
|
40b56feb0f
|
Merge branch 'racecommittee_regattaoverview' of ssh://sapsailing.com/home/trac/git into racecommittee_regattaoverview
|
2013-06-22 23:08:43 +02:00 |
|
Armin Zamani
|
17b8fc9984
|
RegattaOverview: the green circle is shown for finishing races
|
2013-06-22 23:00:31 +02:00 |
|
Armin Zamani
|
551834f882
|
RegattaOverview: Shortened text in table
|
2013-06-22 22:54:37 +02:00 |
|
Armin Zamani
|
aaae77bafb
|
RegattaOverview: Introduced Last update column
|
2013-06-22 22:21:21 +02:00 |
|
Armin Zamani
|
8fbfde3eb5
|
RegattaOverview: unified upper flag, lower flag and direction arrow to one column
|
2013-06-22 22:13:20 +02:00 |
|
Armin Zamani
|
30b851b4aa
|
Merge branch 'master' into racecommittee_app
|
2013-06-22 18:51:05 +02:00 |
|
Armin Zamani
|
31044162a9
|
RegattaOverview: Implemented sorting of entries by start time
|
2013-06-22 18:41:42 +02:00 |
|
Armin Zamani
|
87949c36a0
|
RegattaOverview: Sorting by race status is now possible
|
2013-06-22 18:30:20 +02:00 |
|
Armin Zamani
|
f1c017e450
|
RegattaOverview: Last update time is displayed in additional information (to be shifted to an own column when we unified the flag columns)
|
2013-06-22 18:00:32 +02:00 |
|
Armin Zamani
|
74281bf962
|
RegattaOverview: Table is initially sorted by the course area column
|
2013-06-22 17:47:38 +02:00 |
|
Armin Zamani
|
31b290ad56
|
RegattaOverview: Added a circle indicating the current state of a race
|
2013-06-22 17:24:11 +02:00 |
|
Armin Zamani
|
5625fce9f1
|
Merge branch 'racecommittee_app' into racecommittee_kw13
|
2013-06-22 14:54:36 +02:00 |
|
Armin Zamani
|
3b00f111a3
|
Merge branch 'master' into racecommittee_app
|
2013-06-22 14:54:01 +02:00 |
|
Armin Zamani
|
1d54ffb57f
|
Merge branch 'racecommittee_app' into racecommittee_kw13
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-22 10:25:40 +02:00 |
|
Armin Zamani
|
4d10f5f8b3
|
Merge branch 'master' into racecommittee_app
|
2013-06-22 10:22:35 +02:00 |
|
Armin Zamani
|
c4ac2c3510
|
adapted course layout names according to Kieler Woche Sailing Instructions
|
2013-06-21 19:59:36 +02:00 |
|
Armin Zamani
|
e86a46e92d
|
Merge branch 'racecommittee_kw13' of ssh://sapsailing.com/home/trac/git into racecommittee_kw13
|
2013-06-21 19:45:00 +02:00 |
|
Armin Zamani
|
d11a0cee54
|
RegattaOverview page shows the protest finish time when available
|
2013-06-21 19:44:45 +02:00 |
|
Armin Zamani
|
acf5b97fd5
|
Merge branch 'master' into racecommittee_app
|
2013-06-21 18:41:17 +02:00 |
|
Armin Zamani
|
7732dc51ff
|
Changed the course designer for Gate start back to the classic course designer
|
2013-06-21 18:26:29 +02:00 |
|
Armin Zamani
|
fd5443d859
|
Merge branch 'racecommittee_kw13' of ssh://sapsailing.com/home/trac/git into racecommittee_kw13
|
2013-06-21 18:19:04 +02:00 |
|
Armin Zamani
|
87ed83b6ed
|
App: implemented course layout backup solution
|
2013-06-21 18:18:41 +02:00 |
|
Armin Zamani
|
9886098ffb
|
Merge branch 'racecommittee_app' into racecommittee_kw13
|
2013-06-21 12:52:20 +02:00 |
|
Armin Zamani
|
6dfe3cb713
|
Merge branch 'master' into racecommittee_app
|
2013-06-21 12:51:22 +02:00 |
|
Armin Zamani
|
f7a7daea4f
|
Merge branch 'racecommittee_app' into racecommittee_kw13
|
2013-06-21 10:14:11 +02:00 |
|
Armin Zamani
|
33155faba1
|
Merge branch 'master' into racecommittee_app
|
2013-06-20 21:50:51 +02:00 |
|