 Nidhi Sawhney
|
58f2201db5
|
Merge remote-tracking branch 'origin/master' into simulator
Conflicts:
doc/DEVELOPMENT
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/RaceBoard.css
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapResources.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapSettings.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/ZoomTypeFormatter.java
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/com.sap.sailing.targetplatform.base/site.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-frank.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-p2admin.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local-extern.target
java/com.sap.sailing.www/main.css
java/pom.xml
java/target/configuration/jetty/etc/realm.properties
|
2012-05-08 11:06:59 +02:00 |
|
 fmittag
|
7a7c394cac
|
added missing .gitignore files in com.sap.sailing.operationaltransformation bundles
|
2012-05-03 13:54:30 +02:00 |
|
|
Nidhi Sawhney
|
698ada3fb1
|
Merge remote-tracking branch 'origin/master' into simulator
|
2012-04-22 16:27:21 +02:00 |
|
 Axel Uhl
|
ff23e68c9f
|
added a second OT test which folds a leaderboard column addition with a leaderboard removal
|
2012-03-28 15:42:33 +02:00 |
|
|
Axel Uhl
|
b06c971b51
|
moved logic for leaderboard column handling to RacingEventService to prepare for a first OT test case
|
2012-03-28 12:00:23 +02:00 |
|
|
Axel Uhl
|
8a95d23f81
|
removed S return type from StatesAndOperations.apply, trying to avoid passing huge state objects around
|
2012-03-28 09:52:07 +02:00 |
|
|
Axel Uhl
|
8850b6cab8
|
renamed test case class so maven can find it
|
2012-03-26 23:11:38 +02:00 |
|
|
Axel Uhl
|
1a42433181
|
renamed OperationTransformationTests to OperationTransformationTest to let maven find it
|
2012-03-26 22:11:12 +02:00 |
|
|
Axel Uhl
|
078b7d520f
|
added operational transformation stuff to pom.xml hierarchy for central build
|
2012-03-26 21:20:30 +02:00 |
|
|
Axel Uhl
|
f956c869c5
|
spun off test bundle for operationaltransformation tests
|
2012-03-26 20:55:36 +02:00 |
|