Commit Graph
1000 Commits
Author SHA1 Message Date
Axel Uhl e5ce3bd938 fixed typo in method name 2015-03-18 15:05:21 +01:00
Axel Uhl b2fc08d6f9 Merge branch 'master' into jbross-buoy-tender 2015-03-18 15:03:37 +01:00
Axel Uhl 1f543fdf3f Merge branch 'master' into raceboard-simulation 2015-03-18 13:54:50 +01:00
Jan Broß d3fa7e6860 First working version of Buoy Tender E-Mail invitation 2015-03-17 17:49:05 +01:00
Frederik Petersen 0e1966dd23 Use pct instead of fixed value for leading competitor filter in polars 2015-03-17 17:21:31 +01:00
Christopher Ronnewinkel (D036654) 6012ea08fa Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-03-17 10:59:00 +01:00
Peter Siegmund 3f8a26600e Merge branch 'master' into ubilabs--rcapp--develop 2015-03-16 14:25:21 +01:00
EC2 Server 76708bbe39 fixing syntax error on MaxPointReason.UFD 2015-03-13 19:10:39 +00:00
Axel Uhl cf3d15bced bug2701: add UFD max point reason 2015-03-13 19:59:23 +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
Christopher Ronnewinkel (D036654) a2d684d7be Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-03-11 13:39:18 +01:00
Peter Siegmund 3905cefbc2 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-10 15:29:01 +01:00
Lennart Hensler 9e56bded11 Moved the I18N of the datamining Unit to the sse.datamining bundle 2015-03-09 12:57:37 +01:00
Axel Uhl e8c225ca47 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-06 18:07:04 +01:00
Christopher Ronnewinkel (D036654) fdc503d53b Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java
2015-03-06 15:19:49 +01:00
fmittag dfb2a9c70d removed dark blue from color map for boat colors (due to new dark water color) 2015-03-06 14:32:56 +01:00
Axel Uhl ef7fe75772 added dependency on security.common 2015-03-04 23:20:54 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Peter Siegmund 68c3957082 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-04 09:20:56 +01:00
Axel Uhl fa41887d2b Merge branch 'master' into bug2663 2015-03-03 16:12:19 +01:00
Peter Siegmund 8bfb2863e1 Merge branch 'master' into feature/procedure_wizard 2015-03-03 09:05:44 +01:00
Frederik Petersen c0f6f39e1e Merge branch 'master' into polars
Conflicts:
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	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, Jetty on 8890).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, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2015-03-02 16:13:26 +01:00
Christopher Ronnewinkel (D036654) bfb10818be Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation-threaded 2015-03-02 09:42:04 +01:00
Axel Uhl ee9c3a8eb6 enable null for NaturalComparator arguments 2015-02-27 22:10:31 +01:00
Axel Uhl 56b75890d2 first working version of competitor image upload 2015-02-27 22:01:30 +01:00
Peter Siegmund 31a13b5493 new gradle dependencies 2015-02-27 15:03:11 +01:00
Peter Siegmund 2c547ebb67 Merge branch 'master' into feature/procedure_wizard 2015-02-27 14:24:09 +01:00
Axel Uhl cc5b99ed8f moved SailingPermissionsForRoleProvider to com.sap.sailing.domain.common so that gateway and gwt.ui can both use them in their shiro.ini 2015-02-26 16:23:10 +01:00
Christopher Ronnewinkel (D036654) 0ba2232865 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation-threaded
Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
2015-02-25 19:03:54 +01:00
Christopher Ronnewinkel (D036654) d268bfc658 fix sorting of courses; fix numbering of legs; fix waiting for cache-update; fix concurrent path-computation; 2015-02-25 16:24:00 +01:00
Christopher Ronnewinkel (D036654) 58e61bab70 move leg-identifier to domain.common, as it is required in gwt, as well as, server-backend; 2015-02-25 09:46:31 +01:00
Frederik Petersen 1576b00aef Cleaned up least squares implementations and tests 2015-02-17 13:03:19 +01:00
Frederik Petersen 88aee2ad03 Merge branch 'master' into polars-multivariat-lin-reg 2015-02-16 13:17:02 +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
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
Axel Uhl fe75e7899d simplified CompetitorDTOImpl.hasEmail() 2015-02-11 15:54:26 +01:00
Axel Uhl 67d1444466 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	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.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/pom.xml
2015-02-11 14:55:30 +01:00
Axel Uhl 2beba1f5d1 Merge remote-tracking branch 'server/master' 2015-02-11 14:48:06 +01:00
Axel Uhl bc3437892e added column to leaderboard showing the time since race start in seconds 2015-02-11 11:45:50 +01:00
Fredrik Teschke 52fa52efce choose complicated approach for encoding URLs, as tycho doesn't allow com.google.gwt references in common bundles 2015-02-10 03:36:05 +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
Fredrik Teschke c861fcbd74 upgrade poms of shared and common bundles to 1.7 compiler level 2015-02-10 03:09:27 +01:00
Fredrik Teschke 767652381b add GWT-context-sensitive URLEncoder 2015-02-10 00:48:19 +01:00
Fredrik Teschke 27939b6200 add QRCode to email, and start restructuring device-mapping-url-gen code 2015-02-09 18:08:14 +01:00
Fredrik Teschke 955c1237d7 Merge remote-tracking branch 'origin/master' into jbross-email-invitation
Conflicts:
	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/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
2015-02-09 15:49:40 +01:00
Frederik Petersen 9aea39e56c Polar sheets panel now displays cubic fit in xy diagram 2015-02-09 14:26:04 +01:00