Commit Graph
682 Commits
Author SHA1 Message Date
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
Axel Uhl c632a3fab1 show uploaded image in competitors table; use file RESTlet so that also file:/// URLs can be displayed properly which the browser wouldn't allow 2015-02-27 23:42:47 +01:00
Axel Uhl c574a1178d don't force application/json as Content-Type for all JAX-RS RESTlets but let them choose themselves 2015-02-27 23:24:59 +01:00
Axel Uhl 56b75890d2 first working version of competitor image upload 2015-02-27 22:01:30 +01:00
Axel Uhl 0c4794d41e implement file upload using a plain servlet with Apache multipart suppot, skipping confusing Jersey with FormDataParams that don't work 2015-02-27 18:19:13 +01:00
Axel Uhl e92a688be3 using Jersey Multipart 1.17.0 which is now consistent with our Jersey version 1.17.0 coming from the Eclipse Orbit 2015-02-27 17:40:41 +01:00
Axel Uhl 0a73a43983 fixed string message stuff for competitor dialog and file upload 2015-02-27 16:27:55 +01:00
Axel Uhl e5e693beb2 fixed bug in LocalFileStorageServiceImpl.removeFile regarding the missing getValue() on localPath 2015-02-27 14:12:22 +01:00
Axel Uhl fda2a66dce on the way to a generic file storage service in the sailing gateway bundle; preparing for file upload from AdminConsole 2015-02-27 13:50:34 +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
Axel Uhl 20c2d8acef harmonized the other shiro.ini files; requiring permission manage_users for UserManagement.html 2015-02-26 13:54:07 +01:00
Axel Uhl c196f48ad1 prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point 2015-02-25 18:26:27 +01:00
Axel Uhl 21f76c6dc4 obsolete old bearer access token when a new one is obtained for the subject 2015-02-25 14:36:01 +01:00
Frederik Petersen 3bc7818939 Added web service for showing polar regression functions
This should simplify the extraction of "default" polars for each boat
class.
2015-02-25 08:35:31 +01:00
Frederik Petersen 1c25d8a652 Use new regression based polars where possible 2015-02-24 16:55:59 +01:00
Frederik Petersen 967b66fe15 Merge branch 'master' into polars-multivariat-lin-reg 2015-02-18 09:33:19 +01:00
fmittag 6ddc5b2b9c Merge remote-tracking branch 'origin/master' into bug2601
Conflicts:
	java/com.sap.sailing.server.gateway/webservices/api/v1/index.html
2015-02-16 19:01:00 +01:00
fmittag 0d713fa02b added documentation of the new API to the webservices doc 2015-02-16 18:14:23 +01:00
fmittag f146b815c9 added a EventRaceStatesSerializer 2015-02-16 16:18:58 +01:00
Frederik Petersen 88aee2ad03 Merge branch 'master' into polars-multivariat-lin-reg 2015-02-16 13:17:02 +01:00
fmittag ea1b6e3dcf moved some more code to RaceStateSerializer 2015-02-16 12:24:37 +01:00
fmittag 648d9fd2da moved some code to a RaceStateSerializer 2015-02-16 12:14:43 +01:00
Axel Uhl b037a465a9 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-15 09:03:34 +01:00
Fredrik Teschke 901d4b208f add initial implementation of get-marks-for-race endpoint 2015-02-14 13:18:45 +01:00
Fredrik Teschke 5597d0ce81 clarify documentation of ping-mark endpoint 2015-02-14 12:57:46 +01:00
Fredrik Teschke 54739ed42f add endpoint for pinging marks via regattalog 2015-02-14 12:53:33 +01:00
Fredrik Teschke 763d9fccf4 enable rest api servlets to find any OSGi service 2015-02-14 12:52:36 +01:00
Fredrik Teschke 04f3002a59 clean up rest api description 2015-02-14 12:50:15 +01:00
Fredrik Teschke 4b8b667f57 add REST API doc for smartphone tracking related endpoints 2015-02-14 08:28:45 +01:00
fmittag adeafa93c0 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/CompactEventHeader.ui.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldcompetitorcharts/OldCompetitorCharts.ui.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.ui.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml
2015-02-13 16:10:29 +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
fmittag 73023129c5 Merge remote-tracking branch 'origin/master' into design2015 2015-02-12 13:04:23 +01:00
Fredrik Teschke 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +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 bc21858562 Added option for using the regression for polar speeds 2015-02-09 11:43:28 +01:00
Simon Pamies ce9fbfeba4 Added documentation about the parameter windsourceid 2015-02-08 16:23:52 +08:00
Simon Pamies 20b0662154 Added new service to discover available wind sources for a race 2015-02-08 15:49:41 +08:00
Simon Pamies 57b6650baa Renamed field in wind API to availableWindSources 2015-02-08 15:34:56 +08:00
Simon Pamies 7288aca296 Back to the name EXPEDITION for measured wind sources - a change here has too many implications such as needing to migrate the database 2015-02-08 15:29:08 +08:00
Simon Pamies 3a090cd4a3 Also added new wind sources display list to the new API 2015-02-08 15:28:08 +08:00
Simon Pamies ad565ff96b Optimized display of wind sources by including their id 2015-02-08 14:51:09 +08:00
Simon Pamies 435a562c2e Updated wind source API to also deliver wind source ids to make it possible to filter them; also renamed expedition to windSource 2015-02-08 14:45:53 +08:00
Simon Pamies a602d9d478 Added a parameter to reload connections to wind receivers 2015-02-06 12:14:17 +08:00
Jan Broß d0407c1584 Get additional competitors of racelog in RegattaImpl 2015-02-05 12:31:45 +01:00
Fredrik Teschke 5c15b93e87 add explanation for commented src lines dealing with device type 2015-02-05 11:47:24 +01:00
Fredrik Teschke 896ae4c370 document expected HTTP header 2015-02-05 11:43:29 +01:00
Fredrik Teschke 4508934766 remove com.sap.sse.{gateway, osgi} by moving the few classes into com.sap.sse 2015-02-05 09:28:38 +01:00
Jan Broß 0e4775d51f Add email field to Competitor 2015-02-04 22:36:48 +01:00
Steffen Schaefer f5c0dbce6a CSS and font update to current design 2015-02-04 13:23:01 +01:00