eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 06:10:56 +00:00
Code Activity
36,799 Commits 274 Branches 252 Tags
0a7b43f8b3b951bb8d2137dc705351ea742b277d
Commit Graph
44 Commits
Author SHA1 Message Date
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 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 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
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
Papick Garcia Taboada 09c336eabf Added profile 2015-09-16 14:15:56 +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 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
Steffen Schaefer 1dd5f2d23a AAR deployment for org.json.simple 2015-08-13 08:29:20 +02:00
Axel Uhl 7f67ac85fb Merge branch 'master' into ubilabs--buoy_positioning_app--develop 2015-04-22 14:54:28 +02:00
Axel Uhl 65cc616537 re-formatted org.json.simple.parser package contents to meet our code formatter 2015-04-16 14:37:54 +02:00
Axel Uhl a4fd920ee3 re-formatted org.json.simple implementation to make it fit our code formatter 2015-04-16 14:22:20 +02:00
Axel Uhl 7d687ced29 using compiler as prescribed by the execution environment for org.json.simple; see also bug 2744 comment #10. 2015-04-13 14:11:53 +02:00
Axel Uhl 75423e4c84 downgraded org.json.simple to JavaSE-1.7 so Android projects can use it 2015-03-30 17:51:16 +02: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 c861fcbd74 upgrade poms of shared and common bundles to 1.7 compiler level 2015-02-10 03:09:27 +01:00
Peter Siegmund a8bac028f6 Gradle: changed to local json-simple module 2015-01-16 16:03:40 +01:00
Jens Rommel 111486410d Fiddlig with Java 8 compiler settings... 2014-10-17 11:40:54 +02:00
Axel Uhl 69de0f2d76 upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly 2014-10-01 15:00:44 +02:00
Axel Uhl 161d823dee updated project compliance settings to JavaSE-1.8 2014-10-01 14:44:22 +02:00
Axel Uhl e9130d38f3 upgraded classpaths to JavaSE-1.8 2014-10-01 14:16:18 +02:00
Axel Uhl 7ece44052d upgraded manifests from JavaSE-1.7 to JavaSE-1.8 as runtime environment 2014-10-01 14:08:19 +02:00
fmittag 0e26eaffa1 Added support for enums in toJSONString() method of JSONValue 2013-08-30 12:36:07 +02:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of 
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
 2013-04-11 00:28:12 +02:00
D049941 c393031c41 Merge branch 'master' into 'gwt25' 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
 2012-11-22 15:43:03 +01:00
fmittag f16830bfd0 Fixed a problem with writing of Enum values to json. Enum values are now surrounded with quotes. 2012-09-10 13:59:13 +02:00
Axel Uhl 22b24c0450 switched all projects to Java7 except for those used by as GWT source 2012-01-19 10:01:36 +01:00
fmittag 531aa0166f clean up of all version in all pom.xml files 
- changed 0.0.1-SNAPSHOT to 1.0.0-SNAPSHOT
- changed product version from 1.1.0 to 1.0.0
- removed unnecessary <version> tags in plugins
 2012-01-04 16:04:23 +01:00
Axel Uhl 31b35919c8 build gwt.ui into WEB-INF/classes 2012-01-03 16:55:49 +01:00
Axel Uhl 4156a6b3db explicitly added implements Serializable to make ParseException 
serializable to GWT
 2012-01-03 16:54:31 +01:00
fmittag b3016489d3 revert removal of org.json.simple project 2011-12-08 18:31:12 +01:00
fmittag 6ef85a92ef moved org.json.simple from bundle project to target-base 2011-12-08 15:42:43 +01:00
fmittag e4ec273724 remove m2e nature from all .project files 2011-11-09 22:06:14 +01:00
Axel Uhl 2cd4fb082e added preferences files; removed generated files from git; added missing RaceAverageSpeedColumn.java 2011-10-05 23:51:26 +02:00
Axel Uhl 0282c6a8c8 added Leaderboard interface with first little test cases 
Also, streamlined pom.xml files
 2011-07-29 15:36:49 +02:00
Simon Pamies 48b8bc1747 First working version of new screen to list and select races for event 2011-06-16 22:39:07 +02:00
Simon Pamies b03d9185eb moved all Java stuff to java/ subdir 2011-06-10 16:39:27 +02:00