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 |
|
Frederik Petersen
|
11fde9eb09
|
Added test and fixes for media track export/import
|
2013-07-04 08:35:05 +02:00 |
|
Frederik Petersen
|
f10b2b52cb
|
Added de/serializer for media tracks for master data import
also extracted the top entry functionality of the importer into a
designated object.
|
2013-07-04 07:49:43 +02:00 |
|
Hudson@furcashudson
|
d9db68609a
|
Merge remote-tracking branch 'd043530/master'
|
2013-07-04 00:44:56 +02:00 |
|
Axel Uhl
|
f55259574e
|
improved javadoc formatting
|
2013-07-04 00:43:13 +02:00 |
|
Fredrik Teschke
|
10d51720be
|
renamed routeconverter bundle
|
2013-07-03 23:53:08 +02:00 |
|
Fredrik Teschke
|
2e99784387
|
RouteConverter with removed debug println
|
2013-07-03 22:58:42 +02:00 |
|
Fredrik Teschke
|
26711e3ce0
|
added RouteConverter with custom preferences implementation for performance gain
|
2013-07-03 22:35:02 +02:00 |
|
fmittag
|
99d2e053b9
|
Merge remote-tracking branch 'origin/master' into map_sidelines
|
2013-07-03 21:39:04 +02:00 |
|
fmittag
|
e7c0186fb2
|
improved naming of velum and sailwave result importer
|
2013-07-03 21:35:36 +02:00 |
|
fmittag
|
bb3be71747
|
fixed name of sailwave result importer
|
2013-07-03 21:27:46 +02:00 |
|
fmittag
|
3823874761
|
Merge remote-tracking branch 'origin/master' into sailwave_resultimport
|
2013-07-03 21:24:14 +02:00 |
|
fmittag
|
5a71c366fa
|
changed default dir for sailwave import scanning
|
2013-07-03 21:19:20 +02:00 |
|
Axel Uhl
|
e284454073
|
Merge branch 'master' into map_sidelines
|
2013-07-03 21:00:18 +02:00 |
|
Axel Uhl
|
65efeaacf8
|
Merge branch 'import_dbdata'
|
2013-07-03 21:00:07 +02:00 |
|
Axel Uhl
|
ddaf7cffa2
|
fixed capitalization of Sidelines string
|
2013-07-03 20:59:47 +02:00 |
|
fmittag
|
c8c2af7ae1
|
finished initial version of csv based result importer (with tests) for sailwave
|
2013-07-03 20:56:06 +02:00 |
|
Axel Uhl
|
7e5ae22162
|
Merge branch 'master' into map_sidelines
|
2013-07-03 20:47:08 +02:00 |
|
Axel Uhl
|
50c0996dff
|
switched from using Polyline to using Polygon for sidelines so that we support more than two marks as a sideline in general
|
2013-07-03 20:39:58 +02:00 |
|
fmittag
|
dbecc9ceb9
|
added tests for csv based sailwave import
|
2013-07-03 20:06:20 +02:00 |
|
fmittag
|
0703fd1ef2
|
replaced the XRR based import from sailwave with a .csv based import cause of missing features of the sailwave XRR exporter
|
2013-07-03 19:30:58 +02:00 |
|
Axel Uhl
|
15d5f9d27a
|
Merge branch 'master' into map_sidelines
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-03 17:37:36 +02:00 |
|
fmittag
|
9a2eacfc60
|
Merge remote-tracking branch 'origin/master' into sailwave_resultimport
|
2013-07-03 17:30:34 +02:00 |
|
fmittag
|
e3e24a7bc4
|
Merge remote-tracking branch 'origin/master'
|
2013-07-03 17:28:24 +02:00 |
|
fmittag
|
077aaf7f2b
|
made 49er euorpeans the live event in index.html
|
2013-07-03 17:28:10 +02:00 |
|
Fredrik Teschke
|
2a3351338e
|
Merge remote-tracking branch 'origin-d/master'
|
2013-07-03 17:23:18 +02:00 |
|
Fredrik Teschke
|
3620f90474
|
added new routeconverter version that doesn't include duplicated internal sun class
|
2013-07-03 16:59:54 +02:00 |
|
Lennart Hensler
|
b61510afe2
|
Fixed Bug 1476: Error when deleting a LeaderboardGroup.
|
2013-07-03 15:58:55 +02:00 |
|
Frederik Petersen
|
d8d9bcdcef
|
Added leaderboard group refresher and used it in master data import
|
2013-07-03 14:28:53 +02:00 |
|
Frederik Petersen
|
9b0ecb4ff4
|
Added event refresher and used it in master data import
|
2013-07-03 14:19:51 +02:00 |
|
Frederik Petersen
|
be5acac69b
|
Added regatta refresh to master data import
|
2013-07-03 14:14:13 +02:00 |
|
Frederik Petersen
|
bdd386a87d
|
Override mode for master data import is now available
|
2013-07-03 14:04:13 +02:00 |
|
Frederik Petersen
|
6685f97758
|
Fixed bug in master data import with override
and added test for it
|
2013-07-03 13:26:26 +02:00 |
|
Armin Zamani
|
032b8a5381
|
Merge branch 'master' into racecommittee_app
|
2013-07-03 11:43:14 +02:00 |
|
Frederik Petersen
|
9b995adb4f
|
Merge branch 'master' into import_dbdata
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
|
2013-07-03 10:58:56 +02:00 |
|
Frederik Petersen
|
f9c8ad3760
|
Fixed null pointer in regatta export/import due to null course area
|
2013-07-03 10:56:14 +02:00 |
|
Frederik Petersen
|
54a7c12646
|
Fixed course area null pointer for regatta
|
2013-07-03 10:49:56 +02:00 |
|
Frederik Petersen
|
b2f8dbbada
|
Merge branch 'master' into import_dbdata
|
2013-07-03 10:37:23 +02:00 |
|
Frederik Petersen
|
b8093660ee
|
Fixed NPE for master data import if default course area == null
|
2013-07-03 10:36:19 +02:00 |
|
Frederik Petersen
|
62734243a0
|
Added override flag for master data import
if set, all existing data with clashing names and ids will be overwritten
|
2013-07-03 10:31:37 +02:00 |
|
fmittag
|
dbd3a61e1b
|
added a new sample file for 49erFX for the sailwave result import
|
2013-07-03 10:22:17 +02:00 |
|
Frederik Petersen
|
0457feed82
|
Added test case for persistentreggatasforraceIDs export/import
|
2013-07-03 09:42:26 +02:00 |
|
Frederik Petersen
|
a0e85006b5
|
Added serialization for PersistentRegattaForRaceIDs map to master data
import
|
2013-07-03 09:30:34 +02:00 |
|
Frederik Petersen
|
5b510f985b
|
Added test for master data import without override
also fixed logging for course area (use id instead of new name)
|
2013-07-03 09:03:11 +02:00 |
|
Frederik Petersen
|
0a85d22d53
|
Introduced some logging to master data import operation
logs at info level, when some object with a sepcific name or id already
exists
|
2013-07-03 08:23:20 +02:00 |
|
Axel Uhl
|
edb9bb0103
|
harmonized race column export/import so that also for regatta series the RaceIdentifiers are transmitted
|
2013-07-03 00:01:36 +02:00 |
|
Axel Uhl
|
dc9ac6acc6
|
added missing new file RaceColumnMasterData
|
2013-07-02 22:37:04 +02:00 |
|
Axel Uhl
|
b39a496572
|
added race identifiers to race column export/import so that they are preserved across export/import
|
2013-07-02 22:35:25 +02:00 |
|
Armin Zamani
|
72034625e3
|
Merge branch 'master' into racecommittee_app
|
2013-07-02 22:07:26 +02:00 |
|