Jens Rommel
20423e39ff
Merge remote-tracking branch 'external/master' into dev
2013-01-17 17:21:27 +01:00
Jens Rommel
0b2ac7babf
Merge remote-tracking branch 'external/master' into media
2013-01-17 10:36:05 +01:00
Axel Uhl
dc159cbf3f
Merge branch 'master' into dev
2013-01-15 17:34:06 +01:00
Simon Pamies
8c199d9850
Updated start
2013-01-15 12:39:10 +01:00
Jens Rommel
844fe3b847
Merge remote-tracking branch 'internal/master' into media
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DataEntryDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/PlayStateListener.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/TimePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
java/com.sap.sailing.server/SailingServer (Proxy).launch
2013-01-14 19:31:07 +01:00
Fredrik Teschke
396f4eebde
Merge remote-tracking branch 'origin-t/master' into dev
2013-01-14 10:32:03 +01:00
Simon Pamies
973504b740
Now GWT recompilation is successfully stopped if requested by profile
2013-01-11 15:54:25 +01:00
Axel Uhl
14f1d2f884
Merge branch 'master' into dev
2013-01-11 15:14:39 +01:00
Simon Pamies
58499ece17
Added a script that eases the building process and automagically sets up
...
server env
2013-01-11 14:13:21 +01:00
Simon Pamies
bb7371b87b
Adding SIGAR native libraries path to starter
2013-01-11 14:05:16 +01:00
Simon Pamies
c762dd19a7
Moved native libraries to a centralized location
2013-01-10 10:55:48 +01:00
Jens Rommel
f9170db047
Merge remote-tracking branch 'origin/master' into media
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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.server/SailingServer (Proxy).launch
2013-01-06 12:28:27 +01:00
Axel Uhl
d8db4c66df
Merge branch 'master' into dev
2012-12-20 10:41:17 +01:00
Axel Uhl
ce6f9e277f
adjusted monitoring properties to check for index.html for www bundle instead of / which always responds
2012-12-20 10:36:16 +01:00
Jens Rommel
b0d518d11c
Merge remote-tracking branch 'origin/master' into media
...
+ Further progress with media support:
- added audio awareness, which works already
- still under construction, e.g. whole live cycle/play/pause still not fully wired
2012-12-11 15:10:18 +01:00
Axel Uhl
b4b6030783
Merge branch 'master' into dev
2012-11-30 17:28:26 +01:00
Axel Uhl
56f5810d30
added my mobile e-mail address to monitoring.properties
2012-11-30 17:19:52 +01:00
Axel Uhl
a4d7917e75
Merge branch 'master' into dev
2012-11-30 17:12:05 +01:00
Axel Uhl
c5a0ed6c59
fixed monitoring.properties; fixed monitoring bundle to handle wrong bundle names more robustly
2012-11-30 17:11:37 +01:00
Axel Uhl
b5bdd764f9
Merge branch 'master' into dev
2012-11-30 15:40:50 +01:00
Axel Uhl
d4071b8af2
fixed port in monitoring properties
2012-11-30 15:34:53 +01:00
Axel Uhl
0d2bf91d30
adjusted monitoring properties for other web bundles, adjusted ports to dev ports
2012-11-30 15:33:12 +01:00
Axel Uhl
0f0c5977d9
Merge branch 'master' into dev
2012-11-30 14:33:52 +01:00
Simon Pamies
64d4e061d0
Added check for URL endpoints
2012-11-30 09:47:12 +01:00
Axel Uhl
580d01af0f
Merge branch 'master' into dev
...
Conflicts:
java/com.sap.sailing.feature.p2build/raceanalysis.product
2012-11-29 18:11:37 +01:00
Axel Uhl
a285a3101f
fixed path for monitoring.properties again in install script
2012-11-29 13:44:31 +01:00
Axel Uhl
4015f10a5e
fixed path for monitoring.properties file in install script
2012-11-29 13:42:35 +01:00
Axel Uhl
727453dd27
added copying of monitoring.properties to install script
2012-11-29 13:39:03 +01:00
Axel Uhl
33c8d35ca1
prepared monitoring configuration for sapsailing.com; however, more work is necessary to allow monitoring individual URLs / WebBundle contexts
2012-11-29 13:36:37 +01:00
Axel Uhl
113b02ece6
Merge branch 'master' into dev
...
Conflicts:
java/com.sap.sailing.feature.p2build/raceanalysis.product
2012-11-29 13:09:55 +01:00
Simon Pamies
f318256146
Fixed some problems, added new endpoint definition
2012-11-28 13:12:48 +01:00
Simon Pamies
82ed5425f2
Revamped configuration to be read from file
2012-11-26 19:14:36 +01:00
Jens Rommel
f4b72a4873
Merge remote-tracking branch 'origin/master' into media
2012-11-16 11:47:32 +01:00
Jens Rommel
b4e5a33e98
Implemented database access of media management in Admin Console. Add/create, query and delete already work, update missing, yet.
2012-09-28 12:21:22 +02:00
Axel Uhl
36ce07a610
Merge branch 'master' into dev
2012-09-26 17:28:35 +02:00
Axel Uhl
36ac9e6892
turned off excessive TTCM logging again
2012-09-26 17:27:52 +02:00
Axel Uhl
826d40e600
Merge branch 'master' into dev
2012-09-26 17:27:16 +02:00
Axel Uhl
31e79556b2
fixed bug 968 by invalidating the DistanceCache for the interval between the last fix and the new fix
2012-09-26 17:22:44 +02:00
Axel Uhl
d3ae3950e2
Merge branch 'master' into dev
2012-09-26 13:50:50 +02:00
Axel Uhl
8077638f61
turn off TTCM detail logging by default also for non-debug logging properties
2012-09-26 13:49:54 +02:00
Axel Uhl
3ed26c1256
added logging option for TTCM raw positions; see logging_debug.properties
2012-09-26 13:49:18 +02:00
Axel Uhl
6325da7613
Merge branch 'master' into dev
2012-08-01 15:04:40 +02:00
Axel Uhl
e59665413a
added script to replicate wind through a proxy connection
2012-08-01 10:22:44 +02:00
Axel Uhl
a6003d1ea8
introduced "-f" switch in install script for forceful installation of a deviating branch
2012-08-01 10:12:42 +02:00
Axel Uhl
2f55b8841b
Merge branch 'master' into dev
2012-07-26 10:46:42 +02:00
Axel Uhl
17ec2d8fee
preparing for a distance cache in GPSFixTrackImpl
2012-07-24 18:33:19 +02:00
Axel Uhl
c76add304a
Merge branch 'master' into dev
2012-07-18 15:50:31 +02:00
Axel Uhl
67ee2f6c40
removed filtering of trailing 1/2 again
2012-07-18 13:49:16 +02:00
Axel Uhl
b15ea02574
took back the incredibly wrong commenting of the "if" safety guard; heaven knows what drove me...
2012-07-18 13:42:35 +02:00
Axel Uhl
4bac15fc9d
Merge branch 'master' into dev
2012-07-13 17:37:09 +02:00
Jens Rommel
Axel Uhl
Simon Pamies
Fredrik Teschke