Commit Graph
166 Commits
Author SHA1 Message Date
Fredrik Teschke c861fcbd74 upgrade poms of shared and common bundles to 1.7 compiler level 2015-02-10 03:09:27 +01:00
Jan Broß 0e4775d51f Add email field to Competitor 2015-02-04 22:36:48 +01:00
Nicolas 71a0c68499 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
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
2015-02-04 17:38:16 +01:00
Axel Uhl 3d7137fa03 removed redundant version specidications in bundle dependencies 2015-02-02 15:59:44 +01:00
Fredrik Teschke 3edbbb04bb move type based service finder to sse bundles (create new com.sap.sse.osgi bundle) 2015-01-23 16:56:49 +01:00
Nicolas a6f0206f0d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-01-23 16:12:17 +01:00
Peter Siegmund 353e83f270 Merge branch 'master' into android_apps 2015-01-23 10:08:08 +01:00
Axel Uhl 0c43f2b64b moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common 2015-01-22 11:05:24 +01:00
Axel Uhl ba4d5b0f6c moved CountryCode stuff to SSE 2015-01-22 11:01:01 +01:00
Nicolas 50b0c877b5 Moved (De)Serializers for MarkPassingEvents. 2015-01-18 20:06:51 +01:00
Nick Klose 31e9d0a5a3 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-18 19:39:25 +01:00
Peter Siegmund a8bac028f6 Gradle: changed to local json-simple module 2015-01-16 16:03:40 +01:00
Peter Siegmund c580c10f89 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Axel Uhl c13325e1b3 added com.sap.sailing.server.gateway.serialization.android.shared to feature.xml; made gateway.serialization.[android.shared] lazy-activated 2015-01-14 13:41:23 +01:00
Axel Uhl 485cba10fb added pom.xml for com.sap.sailing.server.gateway.serialization.shared.android 2015-01-14 13:37:48 +01:00
Axel Uhl 8ee256a4b7 split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572 2015-01-14 13:22:22 +01:00