 fmittag
|
59248fcf49
|
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
|
2015-04-16 17:38:08 +02:00 |
|
 Bennet Brunsen
|
e28dec03fc
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-16 11:02:40 +02:00 |
|
 Axel Uhl
|
094234b654
|
moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it
|
2015-04-03 16:12:21 +02:00 |
|
|
Axel Uhl
|
e1e047bd75
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.java
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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2015-03-26 14:51:48 +01:00 |
|
 Peter Siegmund
|
f169fc8b4f
|
Merge branch 'master' into ubilabs--tracking_app--develop
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sse.security.ui/Security UI sdm.launch
|
2015-03-12 10:06:04 +01:00 |
|
|
Axel Uhl
|
f29f4b434d
|
fixed execution enviornment for two last 1.6 projects
|
2015-03-06 17:49:39 +01:00 |
|
|
Axel Uhl
|
330a889dd4
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-03-04 16:46:28 +01:00 |
|
 Fredrik Teschke
|
9c375a3ae4
|
Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
Conflicts:
.gitignore
java/com.sap.sailing.server/SailingServer (No Proxy).launch
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
|
2015-02-13 11:16:50 +01:00 |
|
|
Fredrik Teschke
|
4cb7b535c8
|
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
|
2015-02-13 08:29:41 +01:00 |
|
|
Axel Uhl
|
98d5235b47
|
upgraded all Mongo-using bundles to 2.13.0 driver
|
2015-02-12 16:00:15 +01:00 |
|
 Nicolas
|
7e3aab3a33
|
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
|
2015-02-11 17:58:59 +01:00 |
|
|
Fredrik Teschke
|
523ad4cc3e
|
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation
|
2015-02-10 03:10:29 +01:00 |
|
|
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 |
|