 Peter Siegmund
|
4388050c4b
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-04-21 08:34:38 +02:00 |
|
 fmittag
|
0ef68c4da6
|
Merge remote-tracking branch 'origin/master' into bug2483
|
2015-04-20 19:57:13 +02:00 |
|
|
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 |
|
 Axel Uhl
|
1026bfeafb
|
first draft implementation for a LeagueRacingProcedure with Class Up (3min), Papa Up (2min), Papa Down (1min), Class Down
|
2015-04-16 13:07:08 +02:00 |
|
 Bennet Brunsen
|
e28dec03fc
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-16 11:02:40 +02:00 |
|
|
Peter Siegmund
|
edd32fa10a
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-04-13 09:09:17 +02:00 |
|
|
Peter Siegmund
|
069c6477d5
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-04-07 08:50:05 +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
|
58bd451481
|
moved other Position implementations to common packages to share them with GWT and make then GWT-serializable
|
2015-04-02 16:42:10 +02:00 |
|
|
Axel Uhl
|
75b04d8048
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-03-30 22:09:02 +02:00 |
|
|
Peter Siegmund
|
e03cae1d39
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-30 10:47:18 +02:00 |
|
|
Axel Uhl
|
297f91a098
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-29 17:37:34 +02:00 |
|
|
Axel Uhl
|
cd86e0b13d
|
fix for bug 2742: recognize gate start by not applying fallback racing procedure but only actual racing procedure specifications
|
2015-03-29 17:23:52 +02:00 |
|
|
Axel Uhl
|
fd0f6eadcf
|
fixed use of time point from fixed mark passing specification when reading from race log; minor refactoring saving a few HashMap look-ups
|
2015-03-27 16:28:50 +01:00 |
|
|
Axel Uhl
|
3bfe5c149a
|
added short info to mark passing-related race log events; formatting; refactored common parts in CandidateFinderImpl
|
2015-03-27 15:36:59 +01: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
|
37ab75f057
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-24 17:04:56 +01:00 |
|
|
Axel Uhl
|
f8f3170daf
|
some comment changes
|
2015-03-23 22:48:58 +01:00 |
|
|
Axel Uhl
|
911cdeb86b
|
Merge branch 'master' into jbross-buoy-tender
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2015-03-23 20:52:00 +01:00 |
|
|
Axel Uhl
|
fe46823c24
|
fixing bug 2724 by introducing Set to collect marks
|
2015-03-23 17:39:37 +01:00 |
|
|
Axel Uhl
|
60e1499b50
|
changed format and raceColumn parameter name for marks listing service
|
2015-03-23 17:25:45 +01:00 |
|
|
Peter Siegmund
|
6db5ee9c08
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-22 15:20:03 +01:00 |
|
|
Axel Uhl
|
30a62a68fb
|
started to work on bug2715 by adding a method on TrackedLegOfCompetitor and support method on TrackedRace to calculate distance travled specifically for gate starts
|
2015-03-20 11:27:03 +01:00 |
|
 Jan Broß
|
966b17b178
|
PingMark Endpoint now takes a single GPSFix and should solemnly be used for pinging a mark
|
2015-03-20 10:14:14 +01:00 |
|
|
Axel Uhl
|
4b62fa899f
|
Merge branch 'master' into bug2652
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java
|
2015-03-13 22:27:27 +01:00 |
|
|
Axel Uhl
|
330a889dd4
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-03-04 16:46:28 +01:00 |
|
|
Peter Siegmund
|
68c3957082
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-04 09:20:56 +01:00 |
|
|
Axel Uhl
|
56b75890d2
|
first working version of competitor image upload
|
2015-02-27 22:01:30 +01:00 |
|
|
Peter Siegmund
|
2c547ebb67
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-27 14:24:09 +01:00 |
|
 Lennart Hensler
|
3fa30e7f1e
|
Introduced the HasMarkPassingContext as data type
|
2015-02-26 15:21:29 +01:00 |
|
|
Peter Siegmund
|
197b4e039e
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-16 12:56:03 +01:00 |
|
 Fredrik Teschke
|
54739ed42f
|
add endpoint for pinging marks via regattalog
|
2015-02-14 12:53:33 +01:00 |
|
|
Peter Siegmund
|
b7de2dff53
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-13 16:30:07 +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 |
|
|
Axel Uhl
|
325d308482
|
simplified implementation of CompetitorImpl.hasEmail()
|
2015-02-11 16:26:07 +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 |
|
|
Fredrik Teschke
|
04608c2ae7
|
add email to constructor of CompetitorImpl and fix bug (competitor email not loading on startup)
|
2015-02-10 00:49:53 +01:00 |
|
|
Peter Siegmund
|
abcebf2f04
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-09 11:51:03 +01:00 |
|
|
Jan Broß
|
7900b27805
|
First draft of E-Mail sending service
|
2015-02-05 23:12:44 +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 |
|
|
Peter Siegmund
|
b86411c441
|
Merge branch 'master' into android_apps
|
2015-01-26 09:37:54 +01:00 |
|
|
Peter Siegmund
|
621378ca36
|
Merge branch 'master' into android_apps
|
2015-01-26 09:37:54 +01:00 |
|
|
Fredrik Teschke
|
ab0c06c8e7
|
Merge remote-tracking branch 'origin/master' into ftes-file-storage
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
|
2015-01-25 18:09:22 +01:00 |
|
|
Nicolas
|
6402631c8f
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2015-01-24 16:33:26 +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 |
|