Commit Graph
153 Commits
Author SHA1 Message Date
Steffen Schaefer fc8a893e8c Maven profiles can only be copntrolled by system properties and not
Maven properties of a parent POM. The presence of the "ldi.releaseBuild"
is a good match for the activation conditions of "with-mobile" and
"with-not-android-relevant". It currently seems that in
buildAndUpdataProduct.sh the profiles are correctly activated and
deactivated. So this could also correctly work for local builds.
2015-11-24 14:47:13 +01:00
Steffen Schaefer 7248728674 Changed the activation of "with-mobile" and "with-not-android-relevant"
profiles based on a new property "mobile.build.is.default" so that no
changes are needed for this on the release branch
2015-11-24 14:01:17 +01:00
Steffen Schaefer d8b9014d03 Moved media model and util to com.sap.sse.shared.android project because
this is only shared between backend and android but not usable in GWT UI
2015-11-24 11:40:32 +01:00
Jan Broß 4addae99f1 Use fully qualified classname and ignore deprecation warnings 2015-11-23 14:39:59 +01:00
Jan Broß 07d999cc9e Merge master into bug2851 2015-11-18 18:20:10 +01:00
Steffen Schaefer f63f1c9039 Removed unused maven config that was moved to the parent POM 2015-11-16 08:25:01 +01:00
Steffen Schaefer b021f2d14b Consistently using targetSdkVersion 22 in all AndroidManifest.xml files 2015-11-11 13:34:21 +01:00
Steffen Schaefer 8de15d028e Profile with-mobile isn't active by default for more projects 2015-11-11 11:32:30 +01:00
Steffen Schaefer 29eae8056e Revert "upgraded versions to 1.1.0"
This reverts commit 08ecfb3014.
2015-11-10 17:10:14 +01:00
Steffen Schaefer 308aa245d3 Merge remote-tracking branch 'origin/master' into
android-maven-build-bug3190

Conflicts:
	java/com.sap.sailing.gwt.ui/pom.xml
2015-11-10 10:06:39 +01:00
Fredrik Teschke 9fcf600326 add fix for failing RaceLogStartTimeEvent deserialization 2015-11-09 19:07:18 +01:00
Steffen Schaefer ec138b66c8 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-05 17:11:49 +01:00
Jan Broß f36c072247 Merge branch master in bug2851 2015-11-04 13:36:29 +01:00
Fredrik Teschke 817bb285c7 more housekeeping on RaceLog*Events 2015-11-02 23:09:42 +01:00
Fredrik Teschke f8fbbb35dc remove RaceLogEvent[Restore]Factory and RaceLogEvent* housekeeping
- the factories were not used for any factory purposes, and only resulted in maintenance effort
- unified order of constructor parameters for LogEvent-classes
- standard values for an event-id and createdAt-timestamp are now set once in base classes, instead
  of all over the place
2015-11-02 22:06:42 +01:00
Jan Broß 4fc784a46a Fixes compile error 2015-10-31 15:39:52 +01:00
Jan Broß d32839fcab Implements competitor regsitration behavior described in bug2851 2015-10-31 15:32:12 +01:00
Axel Uhl 08ecfb3014 upgraded versions to 1.1.0 2015-10-23 13:01:48 +02:00
Steffen Schaefer f0f227c3b7 Revert "with-mobile profile isn't active by default anymore so building the webapp without apps is the default"
This reverts commit 90df750312.
2015-10-06 08:50:14 +02:00
Steffen Schaefer 90df750312 with-mobile profile isn't active by default anymore so building the
webapp without apps is the default
2015-10-06 08:37:26 +02:00
Papick Garcia Taboada 60c7462fca Moved mobile build aar configuration into java parent pom 2015-09-29 15:52:05 +02:00
Steffen Schaefer 28c95a5b3f Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-09-23 10:57:57 +02:00
Steffen Schaefer e07f93a226 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-09-22 13:25:01 +02:00
Axel Uhl a5cda4ce2f Fixing NPE when de-serializing start of tracking race log event with null start of tracking time 2015-09-18 09:40:09 +02:00
Axel Uhl bbc9beeb99 fix for bug 3267: null values for logical time point of RaceLogEvent will be serialized as null 2015-09-17 15:30:09 +02:00
Papick Garcia Taboada b71dc3addd Added android packaging plugins to "with-mobile" profiles 2015-09-16 11:58:48 +02:00
Steffen Schaefer 8d06e7918f Using Android SDK 22 to be consistent with the gradle build 2015-09-15 10:13:39 +02:00
Steffen Schaefer eaf01ab06f Merge remote-tracking branch 'origin/ubilabs--rcapp--master' into android-maven-build-bug3190 2015-09-15 10:12:42 +02:00
Axel Uhl 540361b129 on the way to a fix for bug 3237, introduced isMagnetic on RaceLogWindFixEvent; code currently doesn't compile; unclear where to obtain DeclinationService from 2015-08-18 15:19:54 +02:00
Steffen Schaefer 2c3feadeb1 Added excludes for AAR classes.jar 2015-08-13 16:32:08 +02:00
Steffen Schaefer ebc0ecd140 Building aar for more subprojects needed by the apps 2015-08-13 14:26:36 +02:00
Bennet Brunsen dba30ac37f Merge branch 'master' into ubilabs--tracking_app--develop 2015-07-13 14:56:27 +02:00
Samuel Oey 9e10e4831d merged conflicts for bug 2678 2015-07-13 14:54:07 +02:00
Bennet Brunsen 4476a8aa1b Renamed constants 2015-07-13 14:38:39 +02:00
Bennet Brunsen 75601180c0 Fixes typo 2015-07-13 12:54:15 +02:00
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
Bennet Brunsen 55db705fb0 Extracted additional competitor constants 2015-07-09 12:43:22 +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
Bennet Brunsen fe92aa0a70 Moved class to com.sap.sailing.domain.common 2015-07-02 16:05:05 +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