 D049941
|
5b9d469d5b
|
Merge branch 'master-for-merge'
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
java/com.sap.sailing.selenium.test/local-test-environment.xml
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-12-10 15:49:40 +01:00 |
|
 Axel Uhl
|
06e8413847
|
started an Igtimi AdminConsole panel to manage Igtimi accounts
|
2013-12-10 00:33:11 +01:00 |
|
|
Axel Uhl
|
28a7419cb6
|
Merge branch 'master' into igtimi
|
2013-12-09 23:34:36 +01:00 |
|
|
Axel Uhl
|
1404c18f67
|
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
|
2013-12-09 22:06:29 +01:00 |
|
|
Axel Uhl
|
1e2cd16e89
|
fixed swapped name/color in CompetitorImpl.resolve
|
2013-12-09 20:42:57 +01:00 |
|
|
Axel Uhl
|
b1678d914c
|
switched RacingEventServiceImpl to WindTrackerFactory discovery through OSGi service lookup
|
2013-12-09 17:33:57 +01:00 |
|
|
Axel Uhl
|
1749cd54dd
|
removed expedition dependency from RacingEventService
|
2013-12-09 15:37:31 +01:00 |
|
|
D049941
|
be3aecf067
|
Bundle com.sap.sailing.server.gateway.test.support added to be able to
clear the state in tests.
|
2013-12-09 14:33:13 +01:00 |
|
|
D049941
|
3b1d491b65
|
Required bundles fixed.
|
2013-12-09 13:40:12 +01:00 |
|
|
D049941
|
984420ae06
|
Launch configuration with database 'winddbTest' added for the execution
of UI-Tests.
|
2013-12-09 13:11:47 +01:00 |
|
|
D049941
|
9c3c8cfaf3
|
Merge branch 'riccardo' into 'master-for-merge'
Conflicts:
java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java
|
2013-12-09 13:00:58 +01:00 |
|
 fmittag
|
6d543b46b4
|
renamed new attribute displayColor of competitor back to color
|
2013-12-07 16:25:54 +01:00 |
|
|
fmittag
|
5918bb1d14
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-07 14:22:27 +01:00 |
|
 Lukas Niemeier
|
5bd93e0945
|
Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app
|
2013-12-06 23:41:13 +01:00 |
|
|
Axel Uhl
|
eada84769a
|
Merge branch 'master' into racecommittee_app
|
2013-12-06 22:36:06 +01:00 |
|
|
Axel Uhl
|
95f04c8e89
|
fixed replication tests for regatta updates so that they use the operation and apply it to master
|
2013-12-06 22:14:48 +01:00 |
|
|
fmittag
|
62b3a9c6ae
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-12-06 19:19:09 +01:00 |
|
|
Lukas Niemeier
|
266594ec30
|
# clarified comment
|
2013-12-06 18:55:40 +01:00 |
|
|
fmittag
|
d037441787
|
added load/store/editing of the new attribute displayColor for a competitor
|
2013-12-06 18:40:15 +01:00 |
|
|
Lukas Niemeier
|
fedaf06771
|
# comments
|
2013-12-06 18:18:51 +01:00 |
|
|
Lukas Niemeier
|
c16f2c07ef
|
# removed synchronize (not needed)
|
2013-12-06 17:57:05 +01:00 |
|
|
Axel Uhl
|
2992622af5
|
removed redundant white space
|
2013-12-06 17:20:21 +01:00 |
|
|
Axel Uhl
|
a36277c62b
|
fixed indentation
|
2013-12-06 17:15:52 +01:00 |
|
|
Axel Uhl
|
f890ce2cd1
|
consolidated imports
|
2013-12-06 17:12:51 +01:00 |
|
|
Axel Uhl
|
eac50c5fa2
|
don't redundantly replicate the UpdateSpecificRegatta operation in updateRegatta(...)
|
2013-12-06 17:12:01 +01:00 |
|
|
Axel Uhl
|
1efebeef57
|
Merge branch 'master' into racecommittee_app
|
2013-12-06 14:49:01 +01:00 |
|
|
Lukas Niemeier
|
7b4a480de0
|
# clarified RaceState interface
|
2013-12-06 02:37:34 +01:00 |
|
|
Axel Uhl
|
72ee807004
|
working towards true wind calculation
|
2013-12-05 22:18:21 +01:00 |
|
|
D049941
|
6df282edf7
|
Merge branch 'master' into riccardo2
Conflicts:
configuration/udpsender.py
configuration/udpserver.py
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/DatabaseHelper.java
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on
8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java
|
2013-12-05 12:30:46 +01:00 |
|
|
Lukas Niemeier
|
061936c97e
|
# renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
|
2013-12-04 16:18:33 +01:00 |
|
|
Lukas Niemeier
|
492124fd16
|
# renamed proceduresconfiguration to RegattaConfiguration
|
2013-12-04 02:49:46 +01:00 |
|
|
Lukas Niemeier
|
3f30c1353e
|
# golf down time ui
|
2013-12-04 01:10:13 +01:00 |
|
|
Lukas Niemeier
|
d4601894dc
|
# use pass-trough interface instead of getCompetitorStore chain
|
2013-12-03 18:38:36 +01:00 |
|
|
Lukas Niemeier
|
5b238f500a
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/CompetitorMasterDataDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/LeaderboardGroupMasterDataJsonDeserializer.java
|
2013-12-03 18:34:33 +01:00 |
|
|
Lukas Niemeier
|
69ff32e1d8
|
# extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
|
2013-12-02 18:33:08 +01:00 |
|
 Frederik Petersen
|
dd39c1615a
|
Workaround fix for id serialization in master data import
needs more thorough fix when bug 1599 is "fixed"
|
2013-12-02 16:37:11 +01:00 |
|
|
Axel Uhl
|
da0c3f914c
|
Merge branch 'master' into racecommittee_app
|
2013-12-01 23:52:20 +01:00 |
|
|
D049941
|
95f0d74de6
|
RacingEventServiceWithTestSupport is also registered as a service now,
but it is only visible to the gateway bundle.
|
2013-11-30 14:40:55 +01:00 |
|
|
Lukas Niemeier
|
04e8671a11
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-11-29 18:24:13 +01:00 |
|
|
Lukas Niemeier
|
453ac2b142
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-11-29 16:42:07 +01:00 |
|
|
Axel Uhl
|
3aea22dd01
|
offer system properties to configure Igtimi client ID, secret and redirect URI
|
2013-11-29 15:57:14 +01:00 |
|
|
Axel Uhl
|
3370921765
|
fixed another typo
|
2013-11-27 14:25:25 +01:00 |
|
|
Axel Uhl
|
856dc5e4b5
|
added launch config to run Selenium tests against gwt.codesvr UI; expect Firefox "Selenium" profile
|
2013-11-27 14:17:45 +01:00 |
|
 Lennart Hensler
|
a891251731
|
Merge branch 'master' into dataMining
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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-11-27 09:26:23 +01:00 |
|
|
Axel Uhl
|
86e0c591cf
|
Merge branch 'master' into igtimi
|
2013-11-26 17:52:40 +01:00 |
|
|
Lukas Niemeier
|
b09239ae60
|
# added a DateTimePicker control
# added UI to enter Start time in AdminConsole
|
2013-11-26 02:27:41 +01:00 |
|
|
Lukas Niemeier
|
30560c19bf
|
# racing procedure configuration attached to regatta
# some help text in UI
|
2013-11-25 16:46:05 +01:00 |
|
|
Lukas Niemeier
|
773670d608
|
# revamped the configuration system to support remote configuration of racing procedures
|
2013-11-25 00:01:25 +01:00 |
|
|
D049941
|
69b7096b3d
|
Merge remote-tracking branch 'origin/master' into riccardo
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PreviousCompetitorDTOImpl.java
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatClassJsonDeserializer.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RaceDataAccessEval.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RacingEventPersistence.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracReaderFromURLs.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracWriter.java
java/target/stop
|
2013-11-22 16:15:07 +01:00 |
|
|
Lukas Niemeier
|
7d63298739
|
merge fix
|
2013-11-20 19:20:43 +01:00 |
|