Commit Graph
38054 Commits
Author SHA1 Message Date
Papick Garcia Taboada e20a3ae07e Merge branch '60_inch' of ssh://sapsailing.com/home/trac/git into 60_inch
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/nodes/IdleRaceLeaderboard.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
2017-06-13 13:50:53 +02:00
Papick Garcia Taboada 1fd8df4709 Introduced pre live race in context, improved logging 2017-06-13 13:27:43 +02:00
Kai Boernert a6a00a528b Merge branch '60_inch' of ssh://trac@sapsailing.com/home/trac/git into 60_inch 2017-06-13 12:45:11 +02:00
Kai Boernert 8b2d6c1a5b timer leak fixed 2017-06-13 12:44:56 +02:00
Papick Garcia Taboada f5264bd436 Aligned Boats/ Flags when names too long 2017-06-13 10:43:07 +02:00
Kai Boernert 9832ae5310 Merge branch 'master' into 60_inch
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
2017-06-09 13:24:13 +02:00
Axel Uhl dfc22b930b increased error margin in placemark test; geonames.org positions are unpredictable
Change-Id: Iea472c5123f956f297659ddc3b043a3887276fb0
2017-06-09 09:49:30 +02:00
Axel Uhl 6b42c4caac bug 4161: using empty User-Agent in ReverseGeocoder
Change-Id: I9fbcd1b9cefebf6bd19a7a4eafb38e1cceaa7387
2017-06-09 01:59:26 +02:00
Axel Uhl 47bec34c18 Merge branch 'master' into translation
Change-Id: I75e7622a939187324e5e5e81a811a6ff83b953c8
2017-06-08 23:06:42 +02:00
Axel Uhl 9814bf2e41 fixed quotes in StringMessages_fr.properties
Change-Id: I9f4798734f40ec99798e59aa3ee954b85762d787
2017-06-08 23:00:07 +02:00
Axel Uhl b889947cc4 removed extra space character
Change-Id: I4253c495561fdf8dde18227b3bc0694217311ae5
2017-06-08 22:58:02 +02:00
Axel Uhl e0150785e7 bug 4161: adjusted test position to make sure Wentdorf is chosen over Heidkate
Change-Id: Ibf0e4e0b22a96a31eef08a6588c09b177ea23a97
2017-06-08 22:14:44 +02:00
Frank Mittag 40fb715b81 Changed french translation of term 'events' (and all related translations) from 'manifestations' to 'evénements' cause of a hint from the french league guys. Cross checked this with Jerome from BeTomorrow. 2017-06-08 15:15:08 +02:00
Frank Mittag 916894e908 Changed french translation of term 'leaderboard' (and all related translations) from 'Palmarès' to 'Classement' cause of a hint from the french league guys. Cross checked this with Jerome from BeTomorrow. 2017-06-08 14:58:09 +02:00
service.tip.git de91a36107 Translation delivery: commit by SLS (albert.kwiatkowski@sap.com)
Change-Id: I49ef19e5b16b8afc1de641c8a9a8f6abcb5cc24d
2017-06-08 11:52:28 +00:00
Frank Mittag f473b1d192 Added boat class icon for 'Formula Kite' class 2017-06-07 17:54:13 +02:00
Kai Boernert 1a92879a90 cleanup layouting code 2017-06-07 16:52:35 +02:00
Axel Uhl f8069b6edf Merge branch 'bug3992_new_concept' 2017-06-07 16:51:52 +02:00
Axel Uhl d59330207e Merge branch 'master' into bug3992_new_concept 2017-06-07 16:48:51 +02:00
Kai Boernert 48f01f277a fixed 2 nullpointer bugs and cleaned up rootnode logic 2017-06-07 15:54:15 +02:00
Kai Boernert 427b84ab35 readded comment 2017-06-07 14:11:33 +02:00
Kai Boernert e916095de4 added sequence node for race end case 2017-06-07 14:10:55 +02:00
Frank Mittag b487dd5705 Improved leaderboard score comment message (english) for result updates from the race manager app.
(according to https://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=4168)
Leave translation to other languages to OIO.
2017-06-07 13:36:41 +02:00
Peter Siegmund fe805d438e add toast for publish result list 2017-06-07 10:58:47 +02:00
Peter Siegmund 9342f838db fixed wording 2017-06-07 10:55:29 +02:00
Peter Siegmund 754728a279 fixed crash after removing penalty and setting new position 2017-06-07 08:40:31 +02:00
Axel Uhl 737d387ecb added boat classes Hansa 303, SKUD 18, and Weta, including symbols
Change-Id: I33973e7e0d77dec1b8b21100f9c80cd42d2f36cc
2017-06-04 12:45:32 +02:00
Axel Uhl bf519c7c2b re-added lost comment
Change-Id: I944b73f00146887311666eb4e30098ab63b321c2
2017-06-04 09:36:23 +02:00
Axel Uhl b67df90c16 Merge branch 'master' into bug4132 2017-06-04 09:18:45 +02:00
Leon Radeck a69d025e26 Removed unused variable. 2017-06-03 18:46:14 +02:00
Leon Radeck 7b27b0f727 Added english message translation. 2017-06-03 18:36:25 +02:00
Steffen Schaefer 06c22a19bb Merge branch 'bug4162' 2017-06-01 18:45:26 +02:00
Axel Uhl 24d73c344f consolidated imports
Change-Id: I9f68f730e3f8bb85a442ed5307a164f4006cf39a
2017-06-01 18:39:14 +02:00
Axel Uhl b0d5ebc86e removed await timeout because the entire test has a 3s timeout
Change-Id: I08802b6d69bdcce453194271f228b68c73328ef2
2017-06-01 18:38:21 +02:00
Axel Uhl e4c7ce3f30 increased timeout for test for bug4162
Change-Id: I86175cb2a8d58dce632ebf0134560030bc4d5b6c
2017-06-01 18:37:42 +02:00
Steffen Schaefer 83e35d58b6 Merge branch 'bug4162-failing-test' into bug4162 2017-06-01 16:51:53 +02:00
Steffen Schaefer dabcd71869 Bug 4162: Added failing test 2017-06-01 16:51:31 +02:00
Leon Radeck daea9ff4c4 Show message when changing link between racecolumn and new tracked race. 2017-06-01 16:31:45 +02:00
Steffen Schaefer 967df6953e Changed GPSFixStoreListenerTest to not rely on a deadlock anymore 2017-06-01 16:27:28 +02:00
Kai Boernert 90bbc4bbbe Merge branch '60_inch' of ssh://trac@sapsailing.com/home/trac/git into 60_inch 2017-06-01 16:16:55 +02:00
Kai Boernert a3f86f1219 PreRace Competitor view & design 2017-06-01 16:16:44 +02:00
Steffen Schaefer 9e6457311b Solving a deadlock situation of RegattaLogDeviceMappings and
MongoSensorFixStoreImpl
2017-06-01 16:03:48 +02:00
Leon Radeck abaf400166 Code before refactoring. 2017-06-01 15:48:21 +02:00
Papick Garcia Taboada 742f0ed088 Added competitor with flags node 2017-06-01 15:25:50 +02:00
Steffen Schaefer 6ab4ea235d Merge branch 'bug4158' 2017-06-01 14:44:26 +02:00
Papick Garcia Taboada 8396ff2d51 Increased flag whitespace 2017-06-01 14:43:16 +02:00
Papick Garcia Taboada 003d230137 Fixed header alignment 2017-06-01 14:42:58 +02:00
Papick Garcia Taboada f7ab0ea32b Design changes 2017-06-01 14:42:19 +02:00
Papick Garcia Taboada 223ae81009 Added regatta rank 2017-06-01 14:41:26 +02:00
Leon Radeck 1b35da5caa Revert "Show message when selection of a trackedrace is changed that is already linked to a leaderboard."
This reverts commit 126b53235f.
2017-06-01 14:15:17 +02:00