 Axel Uhl
|
5af4fd1db4
|
removed net.sf.marineapi and all NMEA functionality
|
2015-08-05 15:59:11 +02:00 |
|
 Samuel Oey
|
ec02709df8
|
Moved FlatSmartphoneUuidAndGPSFixMovingJsonSerializer into impl package
|
2015-07-06 15:34:11 +02:00 |
|
 Bennet Brunsen
|
73e02a7882
|
Fixes broken imports
|
2015-07-02 16:39:01 +02:00 |
|
 fmittag
|
e16bf09000
|
added 'courseAreaId' to the regatta serializer as there otherwise no way for a client to find out which regattas belong to an event.
|
2015-06-29 19:05:09 +02:00 |
|
 Peter Siegmund
|
4e1db79fa9
|
Merge branch 'master' into ubilabs--rcapp--refactoring
|
2015-06-01 16:28:19 +02:00 |
|
 Steffen Schaefer
|
e07c585934
|
Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2015-05-28 09:55:11 +02:00 |
|
|
Peter Siegmund
|
2209ac62c2
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-05-18 08:42:11 +02:00 |
|
 Frederik Petersen
|
f9d72d8227
|
Added RESTlet for target time estimation
|
2015-05-12 14:45:09 +02:00 |
|
|
Bennet Brunsen
|
639d109e39
|
Revert "adding white space mess "
This reverts commit ec12301feee614dc356732850564b754e0bfc33a.
|
2015-04-30 11:54:47 +02:00 |
|
|
Axel Uhl
|
8d5411c596
|
removed ACCURACY constant that wasn't used anywhere
|
2015-04-24 00:20:27 +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 |
|
|
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 |
|
|
Axel Uhl
|
0269bfc4dd
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-24 20:25:49 +01:00 |
|
|
Axel Uhl
|
c9d9a59ea1
|
implementing solution for bug 2728: adding last known position to marks list
|
2015-03-24 17:10:44 +01:00 |
|
|
Peter Siegmund
|
37ab75f057
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-24 17:04:56 +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 |
|
|
Peter Siegmund
|
6db5ee9c08
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-22 15:20:03 +01:00 |
|
|
Axel Uhl
|
5fd384af5c
|
added metric for distance including gate start consideration to leaderboard and REST API
|
2015-03-20 13:34:44 +01:00 |
|
 Jan Broß
|
3812a00754
|
Reping mark to avoid interpolation
|
2015-03-20 11:53:22 +01:00 |
|
|
Axel Uhl
|
330a889dd4
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-03-04 16:46:28 +01:00 |
|
|
Peter Siegmund
|
197b4e039e
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-16 12:56:03 +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 |
|
|
Peter Siegmund
|
abcebf2f04
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-09 11:51:03 +01:00 |
|
|
Jan Broß
|
d0407c1584
|
Get additional competitors of racelog in RegattaImpl
|
2015-02-05 12:31:45 +01:00 |
|
|
Fredrik Teschke
|
944614c1ac
|
add file storage management service
|
2015-01-23 17:52:21 +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 |
|
|
Peter Siegmund
|
353e83f270
|
Merge branch 'master' into android_apps
|
2015-01-23 10:08:08 +01:00 |
|
|
Peter Siegmund
|
c5ee521e3c
|
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
|
625c995ee2
|
removed PROVIDER and ALTITUDE attribute for fixes; don't require ACCURACY (need unit definition) and don't pass it to GPSFixMovingImpl.create for now
|
2015-01-15 21:05:37 +01:00 |
|
|
Axel Uhl
|
925c45ca61
|
removed PROVIDER and ALTITUDE attribute for fixes; don't require ACCURACY (need unit definition) and don't pass it to GPSFixMovingImpl.create for now
|
2015-01-15 21:05:37 +01:00 |
|
|
Peter Siegmund
|
c580c10f89
|
Merge branch 'bug2572' into android_apps
|
2015-01-14 17:02:18 +01:00 |
|
|
Peter Siegmund
|
015c4f2d82
|
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
|
341717cd56
|
upgraded com.sap.sailing.server.gateway.serialization to JavaSE-1.8 after Android-relevant pieces have been moved to com.sap.sailing.server.gateway.serialization.shared.android
|
2015-01-14 13:34:10 +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 |
|
|
Peter Siegmund
|
c6e0d9b579
|
Merge branch 'master' into android_apps
Conflicts:
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.shared/res/values/strings.xml
mobile/com.sap.sailing.android.tracking.app/pom.xml
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/racelog/impl/RaceLogEventsCallback.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
|
2015-01-13 15:04:22 +01:00 |
|
|
Peter Siegmund
|
f5efb17c75
|
Merge branch 'master' into android_apps
Conflicts:
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.shared/res/values/strings.xml
mobile/com.sap.sailing.android.tracking.app/pom.xml
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/racelog/impl/RaceLogEventsCallback.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
|
2015-01-13 15:04:22 +01:00 |
|
|
Fredrik Teschke
|
bd8c8ff7cb
|
remove DeviceWithTimeRange
|
2014-12-24 11:14:01 +01:00 |
|
|
jan
|
6cbbc1b3c9
|
Added Rest endpoint for getting/setting Team Image
|
2014-12-12 14:38:52 +01:00 |
|
|
Fredrik Teschke
|
6608da120f
|
Merge remote-tracking branch 'origin/master' into regatta-log
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
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/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2014-12-11 11:19:39 +01:00 |
|
|
Fredrik Teschke
|
2c986f7be9
|
Merge branch 'ftes-regatta-log' into regatta-log
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.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/Regatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2014-12-04 10:32:18 +01:00 |
|
|
Axel Uhl
|
4550f975dc
|
Merge branch 'master' into polar-api
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
java/pom.xml
|
2014-12-03 13:10:20 +01:00 |
|
|
fmittag
|
3eea2fe247
|
added 'startDate' and 'endDate' attribute to Regatta (persistence, replication and gateway)
|
2014-11-28 13:45:01 +01:00 |
|