Lennart Hensler
|
42569d1b07
|
Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
java/com.sap.sailing.server/SailingServer (Proxy).launch
|
2014-03-17 22:25:39 +01:00 |
|
Axel Uhl
|
e293866128
|
added implementation and test case for the flexible leaderboard column rename use case;
race log for a renamed column must be migrated in DB which in particular requires removing the race log
events under their old race log identifier key
|
2014-03-17 16:10:32 +01:00 |
|
Axel Uhl
|
9bdbdbe093
|
warn user of race log removal in case the race list of a regatta series is modified
|
2014-03-17 15:33:26 +01:00 |
|
fmittag
|
64b0f8ee8a
|
moved com.sap.sailing.common.filter package content to com.sap.sse.common and added com.sap.sse.common bundle to all launch configurations
|
2014-03-17 14:32:10 +01:00 |
|
Fredrik Teschke
|
8028bb55b0
|
don't capture class object in exception, GWT can't deal with generic class object
|
2014-03-16 23:09:31 +01:00 |
|
Fredrik Teschke
|
9c8f02deed
|
display and edit device mappings in admin console
|
2014-03-16 15:41:20 +01:00 |
|
Lennart Hensler
|
a6dbf58d7e
|
Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
java/com.sap.sailing.datamining.shared/META-INF/MANIFEST.MF
java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
java/com.sap.sailing.datamining/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
|
2014-03-15 08:18:56 +01:00 |
|
D049941
|
b27d364ac0
|
Launch configurations fixed
|
2014-03-14 15:52:37 +01:00 |
|
Axel Uhl
|
3351645f4a
|
Merge remote-tracking branch 'server/master'
|
2014-03-12 15:59:41 +01:00 |
|
fmittag
|
0569fa54c7
|
Merge remote-tracking branch 'origin/master'
|
2014-03-12 15:34:35 +01:00 |
|
Axel Uhl
|
18d3935ba6
|
Merge branch 'bug1666'
|
2014-03-12 15:27:13 +01:00 |
|
Axel Uhl
|
688b50ae5d
|
fixed remaining issue described in bug1666 comment #7 by explicitly storing race log events after receiving them instead of re-adding them
|
2014-03-12 08:42:03 +01:00 |
|
Axel Uhl
|
528b14b10e
|
refactored according to comment #3 on bug 1666: race log now is "merged" upon re-load instead of replaced;
Tests are required for the merging logic.
|
2014-03-12 00:04:17 +01:00 |
|
Axel Uhl
|
c5bbc7566a
|
interims uncompilable commit that still follows the idea of replicating the RaceLogLoaded operation which is invalidated by bug 1666 comment #3.
|
2014-03-11 23:08:19 +01:00 |
|
Axel Uhl
|
ccff8becb0
|
suggestion for a fix to bug 1845. MasterDataImportTest still all green
|
2014-03-11 21:41:04 +01:00 |
|
Axel Uhl
|
beef855a02
|
refactored race log replication operations such that now it should be straightforward to introduce a race log reloaded operation
|
2014-03-10 18:13:00 +01:00 |
|
Fredrik Teschke
|
1ebed6373e
|
changes to placeholder identifier and (de)serialization
|
2014-03-10 15:00:35 +01:00 |
|
Axel Uhl
|
ba4a4d4ceb
|
removed gateway.test.support bundles from default launch configs again
|
2014-03-10 11:40:49 +01:00 |
|
Axel Uhl
|
fa69e108e0
|
added the gateway.test.support bundle to autostart for the local launch configs and use default Windows Firefox location in test environment
|
2014-03-10 11:00:29 +01:00 |
|
Fredrik Teschke
|
9cffd20913
|
added ping mark functionality to adminConsole
|
2014-03-07 22:42:14 +01:00 |
|
Lennart Hensler
|
2fbf86c9e7
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2014-03-06 17:23:07 +01:00 |
|
Fredrik Teschke
|
ca783d378a
|
add getter for CompetitorStore to RacingEventService
|
2014-03-06 16:57:07 +01:00 |
|
fmittag
|
9c631e2ad6
|
Merge remote-tracking branch 'origin/master' into gwt26
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
|
2014-03-06 16:03:11 +01:00 |
|
fmittag
|
8bf5a48b38
|
corrected manifest.mf for gateway.test.support bundle and added autostart property to ensure that this web bundle is always running
|
2014-03-06 16:00:59 +01:00 |
|
Lennart Hensler
|
7ad354f104
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2014-03-06 14:29:52 +01:00 |
|
Frederik Petersen
|
aebca86fac
|
Fixed bug 1825
this breaks import compability with any older versions
|
2014-03-06 10:10:47 +01:00 |
|
Frederik Petersen
|
a2ba9ae52a
|
Improved testability of data importer
|
2014-03-06 09:48:07 +01:00 |
|
Fredrik Teschke
|
0f94d9a47f
|
dropdown list for boatclass in CompetitorEditDialog
|
2014-03-05 11:33:18 +01:00 |
|
fmittag
|
c68a058a2c
|
Merge remote-tracking branch 'origin/master' into gwt26
|
2014-03-03 14:55:51 +01:00 |
|
fmittag
|
8d309ddf91
|
Upgrade to gwt 2.6
- added gwt version 2.6 jars
- added org.apache.commons.lang to all target platforms
- upgraded gwt-maven plugin to 2.6
|
2014-03-03 12:12:25 +01:00 |
|
Lennart Hensler
|
66d008630f
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2014-03-01 17:50:51 +01:00 |
|
Axel Uhl
|
7d4363a1d8
|
Merge remote-tracking branch 'server/master'
|
2014-02-27 18:31:05 +01:00 |
|
Fredrik Teschke
|
9e58c6148a
|
exchanged tabs with spaces
|
2014-02-27 16:44:06 +01:00 |
|
Axel Uhl
|
ac9e4b9a79
|
remove RaceBoard ViewMode enum which only had one literal left
|
2014-02-27 16:42:30 +01:00 |
|
Fredrik Teschke
|
7132a31d34
|
Revert "added racelog editing to AdminConsole"
This reverts commit 7d00664ae6.
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2014-02-26 14:48:35 +01:00 |
|
fmittag
|
de2edfcf37
|
Merge remote-tracking branch 'origin/master' into event_times
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
|
2014-02-25 19:10:59 +01:00 |
|
Lennart Hensler
|
8b39db5517
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2014-02-25 15:34:46 +01:00 |
|
Frederik Petersen
|
0cb0e13353
|
Fixed and refactored import of PersistentRegattasForRaceIDs
Conflicts:
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2014-02-25 15:14:38 +01:00 |
|
Frederik Petersen
|
84d9b20436
|
Fixed persistence of PersistentRegattaForRaceID for data import
fixes 1824
|
2014-02-25 13:07:21 +01:00 |
|
fmittag
|
b5bff27a10
|
Added startDate and endDate as new properties of the 'Event' domain class (including edit UI)
|
2014-02-24 16:04:33 +01:00 |
|
Lennart Hensler
|
ee183b4c9c
|
Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2014-02-24 10:39:47 +01:00 |
|
Axel Uhl
|
4bfaff3491
|
Merge remote-tracking branch 'server/master'
|
2014-02-24 10:22:53 +01:00 |
|
Axel Uhl
|
27240634a1
|
fixing bug 1809 by using a WindTrack in the master data import instead of the raw fixes collection that doesn't get locked during serialization
|
2014-02-24 10:18:49 +01:00 |
|
Frederik Petersen
|
a4f6d5d9f0
|
Added java doc to DataImportLockWithProgress
|
2014-02-24 09:36:01 +01:00 |
|
Frederik Petersen
|
7bb2b2c2c7
|
Fixed map entry deletion for data import lock
|
2014-02-24 09:03:56 +01:00 |
|
Frederik Petersen
|
8e01b10e6f
|
Changed synchronized statements to ReeantrantRWLock
|
2014-02-24 08:38:19 +01:00 |
|
Frederik Petersen
|
59f9a1f7c1
|
Fixed event-regatta association
see bug 1796
|
2014-02-24 07:55:14 +01:00 |
|
Axel Uhl
|
57a0f824f2
|
Merge branch 'master' into dataMining
|
2014-02-22 17:03:22 +01:00 |
|
Axel Uhl
|
373fff1a30
|
turned around the default for persistentcompetitors.clear from true to false
|
2014-02-21 17:41:40 +01:00 |
|
Lennart Hensler
|
c5b562032b
|
Fixed Server launch config with proxy
|
2014-02-21 16:31:42 +01:00 |
|