 fmittag
|
e31e4fa718
|
Merge remote-tracking branch 'origin/master' into bug2929
|
2015-07-10 17:49:42 +02:00 |
|
|
fmittag
|
5ffe2a4eca
|
implemented new attribute 'sailorsInfoWebsiteURL' for 'Event'
|
2015-07-10 17:11:02 +02:00 |
|
 Jan Broß
|
b552f7cec4
|
Adds nextStatus to RaceLogDependentStartTimeEventSerializer
|
2015-07-09 22:05:06 +02:00 |
|
 Peter Siegmund
|
b8870b1b9c
|
added missing dependent start time in getDeserializer
|
2015-07-09 11:28:19 +02:00 |
|
 Axel Uhl
|
01e83a2024
|
include dependent start time JSON deserializer in RaceLogEventDeserializer
|
2015-07-09 10:16:35 +02:00 |
|
 Nick
|
b2c9a44a57
|
Added RaceLogEvents for End and Start of tracking. Renamed unconsistent RaceLogEvents for MarkPassing editing.
|
2015-06-28 09:46:21 +02:00 |
|
|
fmittag
|
a4b2f9ef1a
|
fix for deserialization problem with RaceLogFixedMarkPassingEventDeserializer
|
2015-06-20 16:10:51 +02:00 |
|
|
Axel Uhl
|
535654593c
|
Merge branch 'master' into jbross-dependent-race-start
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
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/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.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/ui/fragments/RaceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
|
2015-06-18 13:45:50 +02:00 |
|
 Steffen Schaefer
|
2d735a532f
|
Changes to not use java.util.Locale.forLanguageTag as it isn't supported
in Android API < 21
|
2015-06-17 16:20:01 +02:00 |
|
|
Peter Siegmund
|
f6f6a1d1b8
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-15 15:06:26 +02:00 |
|
 Jens Rommel
|
3b6986c288
|
Fixed number conversion issue.
|
2015-06-15 11:56:15 +02:00 |
|
|
fmittag
|
706c882e47
|
improved using already known image sizes in case of migration of imageURLs to new image format
|
2015-06-14 16:55:33 +02:00 |
|
|
fmittag
|
9decf43909
|
reworked images and videos of event -> removed double maintenance of imageURLs, videoURLs, sponsorImageURLs -> they are now always calculated from images and videos
|
2015-06-14 16:21:28 +02:00 |
|
|
fmittag
|
8125b4f3d4
|
bigger cleanup of image and video management of an event
|
2015-06-14 14:27:53 +02:00 |
|
|
fmittag
|
0e85f3c32d
|
removed methods to add or remove imageURL, sponsorImageURL and videoURLs as they are now derived always from the corresponding images and videos
|
2015-06-12 17:44:33 +02:00 |
|
|
fmittag
|
396f2d6d03
|
added a language locale attribute to media domain objects
|
2015-06-11 17:22:21 +02:00 |
|
|
fmittag
|
fb80b8c286
|
added json serialize/deserialize tests for images/videos of EventBase
|
2015-06-10 13:28:51 +02:00 |
|
|
fmittag
|
2050627433
|
added Json serializer and deserializer code for images and videos attribute of event
|
2015-06-09 19:10:01 +02:00 |
|
|
Peter Siegmund
|
34bde532fd
|
added LeagueJsonDeserializer and preference entries for League Configuration
|
2015-06-09 16:27:51 +02:00 |
|
|
Axel Uhl
|
ff5ffbb4af
|
fixed persistence for RaceLogDependentStartTimeEvent and added test case; fixed nextStatus loading for RaceLogStartTimeEvent
|
2015-06-02 17:45:38 +02:00 |
|
|
Axel Uhl
|
76a8389152
|
formatting only
|
2015-05-31 23:47:42 +02:00 |
|
|
Axel Uhl
|
bbfdc51512
|
formatting / whitespaces only
|
2015-05-31 20:18:28 +02:00 |
|
|
Axel Uhl
|
bc897e982d
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-05-31 16:34:33 +02:00 |
|
|
Axel Uhl
|
4365699ea6
|
Merge branch 'master' into bug1018
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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_cn.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
|
2015-05-30 06:41:22 +02:00 |
|
|
Jan Broß
|
636272b053
|
Merge remote-tracking branch 'origin/master' into jbross-dependent-race-start
|
2015-05-29 08:46:47 +02:00 |
|
|
fmittag
|
e99fa4b77b
|
Merge remote-tracking branch 'origin/master' into design2015
|
2015-05-27 17:36:05 +02:00 |
|
 Papick Garcia Taboada
|
1e0f861344
|
Introduced fullscreen viewer for home, moved necessary media classes to sse
|
2015-05-26 17:09:52 +02:00 |
|
|
Axel Uhl
|
2cf3d90a81
|
Merge branch 'master' into bug1018
|
2015-05-23 12:00:31 +02:00 |
|
|
Axel Uhl
|
c924d6d9c7
|
fixing an NPE in JSON serializer when leaderboard display name is empty
|
2015-05-23 11:54:00 +02:00 |
|
|
Jan Broß
|
45563b88db
|
Introduce RaceLogResolver and RaceLogDependentStartTimeFinder
|
2015-05-22 16:00:00 +02:00 |
|
|
Jan Broß
|
09d210a61b
|
Introduce SimpleRaceLogIdentifier for identifying dependent races
|
2015-05-20 10:05:48 +02:00 |
|
|
Jan Broß
|
81fa2d4fb6
|
Add DependentStartTimeEvent and replication + de/serialization
|
2015-05-18 20:55:16 +02:00 |
|
|
Axel Uhl
|
ba1fceecaa
|
added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization
|
2015-05-14 20:10:20 +02:00 |
|
|
Peter Siegmund
|
125ff95d12
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-05-06 08:57:26 +02:00 |
|
|
Axel Uhl
|
2420a11519
|
addressing bug 2770, adding displayName field to RaceGroup and its serialized JSON form
|
2015-05-05 21:53:51 +02:00 |
|
|
Axel Uhl
|
181e5ee5b9
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-05-04 23:14:52 +02:00 |
|
|
fmittag
|
f3a434aa8b
|
implemented configuration for the league racing procedure
|
2015-04-24 10:26:35 +02:00 |
|
|
Axel Uhl
|
18997d1159
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-22 14:55:23 +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 |
|
 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 |
|