Marcus Kammer
59fc80c710
Merge branch 'master' into mak-opensans
2013-07-05 17:00:54 +02:00
Marcus Kammer
d9d4a46277
Replace Ubuntu Font wit OpenSans Font.
...
New Font.
2013-07-05 16:58:30 +02:00
Marcus Kammer
7d5367cc74
Replace Ubuntu Font with OpenSans Font.
...
New Font.
2013-07-05 16:56:35 +02:00
Marcus Kammer
d043c33c2a
Convert spaces to tabs.
2013-07-05 16:56:02 +02:00
Lennart Hensler
14fcd63fdc
Implemented the multi deletion for regattas
2013-07-05 16:29:16 +02:00
Marcus Kammer
522d47d7da
Replace Ubuntu Font with OpenSans Font.
...
New Font.
2013-07-05 15:04:41 +02:00
Marcus Kammer
1a0b6e462a
Replace Ubuntu Font with OpenSans Font.
...
New Font.
2013-07-05 15:02:32 +02:00
Marcus Kammer
856eb29430
Change OpenSansBold to OpenSansSemiBold.
2013-07-05 14:48:26 +02:00
Marcus Kammer
f26fae073d
Change OpenSansBold to OpenSansSemiBold.
2013-07-05 14:48:05 +02:00
Lennart Hensler
7929239480
Implemented the multi deletion of Leaderboards.
2013-07-05 13:54:39 +02:00
Fredrik Teschke
fd5936156f
updated launch configs to new routeconverter version
2013-07-05 13:43:23 +02:00
Fredrik Teschke
17c4c03c6c
Merge remote-tracking branch 'origin-t/master'
2013-07-05 13:26:56 +02:00
Fredrik Teschke
698dc68c90
new version of routeconverter bundle
2013-07-05 13:21:05 +02:00
fmittag
c8d57c7f23
Merge remote-tracking branch 'origin/master'
2013-07-05 12:29:53 +02:00
fmittag
c1cb7b5251
improved boat class image resolver to handle also '49FX' as compatible boat class for 49er boats
2013-07-05 12:29:43 +02:00
Axel Uhl
6f73e766dc
removed unnecessary redundancy between removeLeaderboardGroups and removeLeaderboardGroup
2013-07-05 11:15:45 +02:00
Lennart Hensler
e51ffc31ad
Started the implementation of the leaderboard multideletion.
...
Commit to get the changes on my home pc.
2013-07-05 10:55:37 +02:00
Axel Uhl
ae614a3402
Merge remote-tracking branch 'server/master'
2013-07-05 10:39:09 +02:00
Axel Uhl
ce8d7c7e96
eliminated warning by removing trailing / from build.properties
2013-07-05 10:38:13 +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
Lennart Hensler
69395e55bf
Merge remote-tracking branch 'extern/master'
2013-07-05 08:32:43 +02:00
Marcus Kammer
642b8ef252
Replace Ubuntu Font with OpenSans Font.
...
New Font.
2013-07-05 08:25:58 +02:00
Marcus Kammer
206ba7ed33
Replace Ubuntu FOnt with OpenSans Font.
...
New Font.
2013-07-05 08:22:44 +02:00
Marcus Kammer
0fda185097
Replace Ubuntu Font with OpenSans Font.
...
New Font.
2013-07-05 08:20:58 +02:00
Marcus Kammer
4013472a38
Replace UbuntuBold with OpenSansBold.
...
New Font.
2013-07-05 08:17:35 +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
Marcus Kammer
66bb2759bd
Remove old Ubuntu Fonts; Add new OpenSans Fonts
2013-07-04 20:27:09 +02:00
Lennart Hensler
0f8571bec2
Merge remote-tracking branch 'origin/master'
2013-07-04 17:00:32 +02:00
Axel Uhl
798eae796b
Merge remote-tracking branch 'server/import_dbdata'
2013-07-04 16:55:20 +02:00
Frederik Petersen
600f01f111
Buttons will be disabled and enabled depending on the situation in master
...
data import panel
2013-07-04 16:52:05 +02:00
Frederik Petersen
952ccbdfc8
Use string messages in master data import panel
...
also tell user to choose at least one leaderboard group before clicking
button. disabling it is the next step
2013-07-04 15:59:18 +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
Frederik Petersen
31e0aa1b4a
Merge branch 'master' into import_dbdata
2013-07-04 13:38:00 +02:00
Frederik Petersen
f1eab43172
Fixed issues with override mode in master data import
...
override mode made the whole import process overwrite events and regattas
again and again if they were (indirectly) contained in several leaderboard
groups. This is now fixed. The creation count object holds sets with
identifiers of the objects that have been created during the process.
also the number of created elements are validated in the test cases
2013-07-04 13:33:43 +02:00
Jens Rommel
9ddae2f591
Added missing bundle to (Proxy) launch config.
2013-07-04 13:27:52 +02:00
Jens Rommel
7822627f8d
Merge branch 'refs/heads/jens--media-synch-consolidated' into master-ext
2013-07-04 13:15:38 +02:00
Axel Uhl
5710e2f9c5
made ReverseGeocoderTest more flexible regarding changes to population; made ReverseGeocoderImpl more flexible regarding number formats
2013-07-04 12:44:00 +02:00
Lennart Hensler
af43ec9d37
Added multi selection to the leaderboard group config panel, to remove
...
multiple groups at once.
2013-07-04 11:16:24 +02:00
Frederik Petersen
81cc0d55c2
Fixed problem in master data import concerning leaderboardgroups
...
leaderboardgroups where empty if the leaderboard was already added to
another leaderboard group
added test case for that
small fix to override mode for media tracks
2013-07-04 11:01:54 +02:00
Jens Rommel
78a2b9577e
Running version. Known bug: Multiple Youtube videos on the same Raceboard are not yet supported.
2013-07-04 10:56:08 +02:00
Fredrik Teschke
af1098020c
removed no longer existent source folder from build.properties
2013-07-04 10:20:13 +02:00
Fredrik Teschke
ceee5041d8
Merge remote-tracking branch 'origin-t/master'
2013-07-04 10:18:07 +02:00
Fredrik Teschke
9b7f827ee4
added test launch for proxy
2013-07-04 10:17:16 +02:00
Fredrik Teschke
5c29e5a407
fixed all data sources for export
2013-07-04 09:56:51 +02:00
Armin Zamani
fbdfc2799a
Merge branch 'master' into racecommittee_app
2013-07-04 09:36:56 +02:00
Frederik Petersen
c264798241
Merge branch 'master' into import_dbdata
2013-07-04 08:37:05 +02:00