eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 06:17:27 +00:00
Code Activity
31,076 Commits 276 Branches 259 Tags
d3bed917ed5d4eac5df3a89870e0873eacbf57dd
Commit Graph
187 Commits
Author SHA1 Message Date
Axel Uhl 3917060c1a Merge branch 'master' into android-maven-build-bug3190 
Conflicts:
	java/pom.xml

Change-Id: I8707442d05979fcd8e0a8be0b593ee3e94a513d3
 2016-01-12 12:47:30 +01:00
Axel Uhl 5ce9fa6b0f removed version specificity for datamining.annotations dependency in com.sap.sse.commong 
Change-Id: Ida5a872fbb7d66e36bd08b3e7e39d9476cf89285
 2015-12-09 14:45:24 +01:00
Steffen Schaefer fca622efa7 Merge branch 'master' into android-maven-build-bug3190 
Conflicts:
	java/com.sap.sailing.domain.common/pom.xml
	java/com.sap.sailing.domain.shared.android/pom.xml
	java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml
	java/com.sap.sse.common/pom.xml
	java/com.sap.sse.datamining.annotations/pom.xml
	java/com.sap.sse.security.common/pom.xml
	java/org.json.simple/pom.xml
	java/pom.xml
	mobile/com.sap.sailing.android.shared/pom.xml
	mobile/com.sap.sailing.racecommittee.app/pom.xml
	mobile/pom.xml
	pom.xml
 2015-11-30 15:02:06 +01:00
Steffen Schaefer 3c25092bc5 Consistently using spaces for intendiation in several POMs 2015-11-30 14:55:28 +01:00
Steffen Schaefer 5cc6d15184 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-25 08:41:04 +01:00
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
Steffen Schaefer 169301db27 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-23 08:38:24 +01:00
Axel Uhl c37a645e7b formatting Pair and Triple in Util.java 2015-11-20 15:05:35 +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
Lukas Furmanek e3cdc1ae08 Bug3199: corrections at variable definitions 2015-11-09 13:19:28 +01:00
Axel Uhl 48ea0f5a0f Merge remote-tracking branch 'server/bug3199' into bug3199 
Conflicts:
	java/com.sap.sse.common/src/com/sap/sse/common/Util.java
 2015-11-09 13:00:10 +01:00
Lukas Furmanek 5305179dde Merge branch 'tmp' into bug3199 2015-11-08 16:14:44 +01:00
Lukas Furmanek d1e455a573 Bug3199: renamed objekt into object & JavaDoc 2015-11-08 15:05:54 +01:00
Axel Uhl 52b3c6d981 adjusted to coding conventions, renamed Util.getDominantObject 2015-11-06 18:10:29 +01:00
Steffen Schaefer ec138b66c8 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-05 17:11:49 +01:00
Axel Uhl da80201a3e Merge branch 'master' into bug3199 2015-11-05 16:47:07 +01:00
Lukas Furmanek af2cb8fdcc Bug3199:Bugfix with a generic boatClassSearch. 2015-11-05 12:55:06 +01:00
Axel Uhl 34c4b08092 search result now returns multiple events per leaderboard 2015-11-03 18:20:09 +01:00
Axel Uhl 08ecfb3014 upgraded versions to 1.1.0 2015-10-23 13:01:48 +02:00
Papick Garcia Taboada b2b8813d72 Merge branch 'master' into android-maven-build-bug3190 
* master: (98 commits)
  Disabled the generig data mining RESTlet
  Added the docu for the data mining RESTlets
  Implemented a predefined query to get the sum of maneuvers per competitor
  Added a dimension to get the amount of maneuvers for a race of a competitor
  Added the distance sum query to the regatta queries
  Made Distance json serializable and added a predefined query for the distance sum grouped by competitor name and leg type
  Added average speed query for race of regatta to the RESTlets
  Implemented "ensureInjected" behaviour and removed duplicate script injecting.
  Cleaned DataMiningResource and added simple query for regattas
  merge import consolidation
  fixed merge accident: remove ssj.jar from simulator bundle's .classpath
  save subtraction in BlastRandom.nextExponential();
  correct relation of geometric and exponential distribution;
  Cleaned the CompoundGroupKey
  use java.util.Random for random number generation (used for wind pattern with gusts); remove library "ssj.jar";
  Minor change in the DataMiningServer interface
  removing reference to idangerous swiper from AutoPlay.html
  removed idangerous.swiper.js which is not used anymore
  removed jdom from xmlexport bundle's lib/ folder and acquire it from target platform instead
  Added a predefined query for all races for testing
  ...
 2015-10-21 14:47:49 +02:00
fmittag 2d9e617251 removed image preview from image edit dialog 2015-10-13 15:47:00 +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 8a6fff96b3 Merge remote-tracking branch 'origin/master' into 
android-maven-build-bug3190

Conflicts:
	java/pom.xml
 2015-09-28 11:33:24 +02:00
Frederik Petersen 2c05a66b2c Use natural comparator in datamining ui, also moved class 2015-09-21 10:45:15 +02:00
Frederik Petersen 082d333830 datamining.shared was replaced by datamining.annotations for android 
dependencies
 2015-09-17 17:22:40 +02:00
Lennart Hensler 9a4d340362 Merge branch 'dataMining' into polars 
Conflicts:
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainBuilder.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainDefinition.java
 2015-09-16 15:32:22 +02:00
Papick Garcia Taboada 0c180f8c01 Fixed exclusion lists broken after profile introduction 2015-09-16 15:14:45 +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
Frederik Petersen f0f99bb059 Merge remote-tracking branch 'origin/dataMining' into polars 
Conflicts:
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionProvider.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/DataRetrieverChainDefinitionManager.java
 2015-09-14 10:08:33 +02:00
Frederik Petersen c8c0ebf220 Settings button now shown next to dropdown in datamining 
only if the chain definition hasSettings returns true
 2015-09-10 16:42:26 +02:00
Axel Uhl eab66cda11 removed version specificity of manifest dependency on our own project 2015-09-09 17:31:02 +02:00
Axel Uhl 8952bba015 Merge branch 'master' into bug3022 2015-08-18 15:20:56 +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
Lennart Hensler 85ce760f91 Merge remote-tracking branch 'origin/master' into dataMining 
Conflicts:
	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-07-30 14:12:14 +02:00
Axel Uhl 087be7f366 moved approximateNow into a new class ApproximateTime in shared.android where we can use Timer and TimerTask which are not GWT-compatible 2015-07-28 00:02:30 +02:00
Axel Uhl 78ff26a17e introduced MillisecondsTimePoint.approximateNow() and used where now() is too expensive; re-typed now() to TimePoint 2015-07-27 22:48:09 +02:00
Lennart Hensler 6044e77e25 Improved group key ordering and implemented a rough MultiResultsPresenter 2015-07-26 17:51:29 +02:00
Axel Uhl ec097a63e7 started to work on bug 3022, cleaning up the DistanceCache leaking mess 2015-06-26 21:56:55 +02:00
Alexander Ries 79aeb1c8a6 sovled master merge conflicts in dashboards EventLogo 2015-06-16 22:43:12 +02:00
Alexander Ries 65c896a85b added javadoc to Util.isTimePointInRangeOfTimePointsAandB() 2015-06-16 15:20:20 +02:00