Axel Uhl
|
5d3853460d
|
fixed detaching of race log by using RaceLogIdentifier.getIdentifier() to calculate the identifier used in the race log map
|
2013-07-03 13:29:20 +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 |
|
Axel Uhl
|
135e677065
|
remove wind fixes from race committee wind source's track when race log is detached from tracked race
|
2013-07-03 13:09:23 +02:00 |
|
Axel Uhl
|
ee9695db8b
|
Merge branch 'master' into racecommittee_wind
|
2013-07-03 12:56:39 +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 (Server)
|
586116dbb9
|
fixed bash options for remote deploy
|
2013-07-03 00:22:12 +02:00 |
|
Axel Uhl (Server)
|
1022e5abcd
|
use bash -c -l to get login shell with properly set JAVA_HOME etc for remote deploy
|
2013-07-03 00:19: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
|
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 |
|
Axel Uhl
|
4b6a6975b3
|
preserve order of leaderboards in leaderboard group during import
|
2013-07-02 21:51:50 +02:00 |
|
Fredrik Teschke
|
b0668ecec8
|
Merge branch 'master' into gps-export
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
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
|
2013-07-02 18:03:46 +02:00 |
|
Axel Uhl
|
1ce4b1596a
|
fixed another NPE in deserializer for nationality
|
2013-07-02 17:58:32 +02:00 |
|
Axel Uhl
|
6f3f96f697
|
Merge branch 'import_dbdata'
|
2013-07-02 17:54:33 +02:00 |
|
Frederik Petersen
|
b9f0da6b1c
|
Nationality serializer and deserializer now check for null value
|
2013-07-02 17:53:00 +02:00 |
|
fmittag
|
cd8d3f1035
|
added resource folder to build.properties
|
2013-07-02 17:43:54 +02:00 |
|
Axel Uhl
|
7ec1a7906f
|
enhanced logging for tests to better understand where it blocks if it blocks
|
2013-07-02 17:11:47 +02:00 |
|
fmittag
|
4b8a9eca58
|
added sailwave result importer to product definition (autostart)
|
2013-07-02 16:39:37 +02:00 |
|
fmittag
|
7ea6ce43cb
|
Merge remote-tracking branch 'origin/master' into sailwave_resultimport
|
2013-07-02 16:00:21 +02:00 |
|
Axel Uhl
|
6e09cb3c7f
|
moved BoatClassMasterdata back to where it belongs
|
2013-07-02 15:31:52 +02:00 |
|
Axel Uhl
|
8a95d4f49c
|
Merge branch 'master' into import_dbdata
|
2013-07-02 15:24:59 +02:00 |
|
Axel Uhl
|
fd4a71d891
|
Merge remote-tracking branch 'origin/import_dbdata' into import_dbdata
|
2013-07-02 15:11:49 +02:00 |
|
Frederik Petersen
|
a3dcd7c9d6
|
Creation of events and course areas now possible without replication
this is important for the Master Data Importer not to replicate things
twice
|
2013-07-02 14:37:04 +02:00 |
|
Frederik Petersen
|
29ce40b930
|
Regattas can now be created without replication
important for master data import as it itself is a replication operation
|
2013-07-02 14:21:06 +02:00 |
|
Jens Rommel
|
5d6989d9c5
|
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch-consolidated
|
2013-07-02 13:46:52 +02:00 |
|
Jens Rommel
|
34e3350177
|
Merge commit '599313c856e9ae22ffa3fd7809b6ce84683879af' into jens--media-synch-consolidated
|
2013-07-02 13:45:42 +02:00 |
|
Frederik Petersen
|
31760a3902
|
Added source folder of master data import to gwt.xmls
|
2013-07-02 13:30:55 +02:00 |
|
Frederik Petersen
|
40fa1ea6b9
|
Merge branch 'master' into import_dbdata
|
2013-07-02 13:09:47 +02:00 |
|
Frederik Petersen
|
570dfef4be
|
Removed master data import post servlet
replaced with sailingservice implementation
|
2013-07-02 13:08:15 +02:00 |
|
fmittag
|
547b4d107a
|
Merge remote-tracking branch 'origin/master' into map_sidelines
|
2013-07-02 11:31:00 +02:00 |
|
fmittag
|
72f4fc57b7
|
Fixed NPE in RegattaLeaderboardDialog in case a regatta defines it's own discarding rules
|
2013-07-02 11:19:27 +02:00 |
|
fmittag
|
7044da894b
|
Merge remote-tracking branch 'origin/master' into map_sidelines
|
2013-07-02 10:59:08 +02:00 |
|
fmittag
|
5933d0fae7
|
reverted the usage if the SAPJVM in the no proxy launch configuration
|
2013-07-02 10:49:15 +02:00 |
|
Fredrik Teschke
|
f1a0df5a9c
|
edited feature.xml to include new bundles
|
2013-07-02 09:56:19 +02:00 |
|
Frederik Petersen
|
3f068e0917
|
Renamed MasterDataSerializerForNames
|
2013-07-02 09:49:12 +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 |
|