Commit Graph
38107 Commits
Author SHA1 Message Date
Steffen Schaefer 436bf158aa Merge branch 'master' into 60_inch 2017-06-22 16:54:18 +02:00
Axel Uhl b91a88bb5c Merge remote-tracking branch 'server/master' 2017-06-22 10:33:15 +02:00
Axel Uhl e156534a1e fixing result import: consider time stamp to make unique for equal boat class
Change-Id: If52ddc1f5d29e1972577c90e609f75083950edb7
2017-06-22 10:31:16 +02:00
Axel Uhl 70b62a22d5 removed redundant override in Manage2SailResultDocumentProvider
Change-Id: I1a9b62467a3432f1e929e44fe67873caf8044dd2
2017-06-22 09:50:21 +02:00
Steffen Schaefer 505d153ebe Fixed compiler warnings 2017-06-22 09:08:33 +02:00
Steffen Schaefer b5d7e8c080 Merge branch 'master' into 60_inch
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
2017-06-22 09:07:43 +02:00
Axel Uhl 3b04ac692d Merge remote-tracking branch 'origin/bug4175' 2017-06-22 01:01:03 +02:00
Axel Uhl 51806f0b86 fix for advantage line aftermath of bug 4175
Change-Id: I0e51c7ed499de7ab579c6613f132950478fe8545
2017-06-21 19:43:22 +02:00
Axel Uhl 314b178202 using Map instead of LinkedHashMap for quick ranks; they are not sorted anymore
Change-Id: I50776034a659d7363c564ba43db7ceae87e2102c
2017-06-21 19:01:46 +02:00
Papick Garcia Taboada f44b788a7a Added release notes for new autoplay 2017-06-20 16:05:37 +02:00
Papick Garcia Taboada 8da357fb9c Merge remote-tracking branch 'origin/master' into 60_inch 2017-06-20 15:46:36 +02:00
Papick Garcia Taboada 5fb3a83118 Removed duplicate release notes file, copied missing content to the "real one" 2017-06-20 15:44:27 +02:00
Kai Boernert f0c79dd572 Merge branch '60_inch' of ssh://trac@sapsailing.com/home/trac/git into 60_inch 2017-06-20 15:33:35 +02:00
Kai Boernert 40d1ba137c added statistics to liverace view 2017-06-20 15:29:47 +02:00
Kai Boernert b9895c529e added ability to query autoplayhelper how long the current race is live 2017-06-20 15:28:07 +02:00
Papick Garcia Taboada c6cc61fddc Removed max video time 2017-06-20 15:14:42 +02:00
Axel Uhl 7d2feff5bf add IControlsListener to receive position update for static marks; unsubscribe listeners properly again in onStop
Change-Id: I8aa109fd572bc68e8c0d2d14a76e58979e036715
2017-06-20 13:51:02 +02:00
Papick Garcia Taboada 97eb06279c Implemented Video node 2017-06-20 13:48:08 +02:00
Papick Garcia Taboada 06aa5d179c Merge branch '60_inch' of ssh://sapsailing.com/home/trac/git into 60_inch 2017-06-20 11:37:27 +02:00
Kai Boernert 5825472d2f Added BigScreen tag to images and videos, changed layout and bg logic of
idleupnext view
2017-06-20 11:36:58 +02:00
Papick Garcia Taboada e812547b30 Added logo to autoplay header 2017-06-20 10:42:04 +02:00
Axel Uhl 6453c9c288 bug4175: quick ranks cache updates and visualization now work well in local test
Change-Id: Ia23800cbce68b248b750116dc09c0e4b729fc3ed
2017-06-20 01:01:49 +02:00
Axel Uhl ea76cdd074 Merge branch 'master' into bug4175 2017-06-19 17:56:07 +02:00
Axel Uhl c98398c139 fixed bug 4188: HOBIE_16 gets a catamaran visualization
Change-Id: I331786097c2d9ffacfcee58a31898065a70b0cde
2017-06-19 17:51:34 +02:00
Axel Uhl 8a219939b2 Merge branch 'master' into bug4175 2017-06-19 17:42:50 +02:00
Axel Uhl 0a7140b5b6 added null check in case mark does not have valid position (bug 4187)
Change-Id: Ib8b775de0a10847f36ec535a9ae889fe93849b67
2017-06-19 17:42:22 +02:00
Kai Boernert f1bba0e406 Changed Idle leaderboard to show overall 2017-06-19 17:36:17 +02:00
Axel Uhl 8c5af7dd53 added null check in case mark does not have valid position (bug 4187)
Change-Id: Ib8b775de0a10847f36ec535a9ae889fe93849b67
2017-06-19 16:46:53 +02:00
Kai Boernert 2f4f62c82a Merge branch 'master' into 60_inch 2017-06-19 13:40:26 +02:00
Axel Uhl 556a8b9b6b fixing IndexOutOfBounds for BasicRacingProcedure when race is in FINISHING state
Change-Id: Ide24c5539010ed46ac24b3bcb90ed8908be380d4
2017-06-19 10:51:22 +02:00
Axel Uhl 9065df6235 compilable version of competitor info update (bug 4175)
Change-Id: Ia20077ef7b6b561b7b9ea24c5dd4b790471a5a43
2017-06-19 09:53:40 +02:00
Axel Uhl 4dace71313 fixed noResults messages another time
Change-Id: I5a67400a143fad4d3a74c7dd45a95d020c1a0914
2017-06-18 11:22:26 +02:00
Axel Uhl 24d57146c1 adjusted messages for "noResults" in English, _de, _fr and _es
Change-Id: Ia308887becbf54e8a33b297c20b7391c9cbe733c
2017-06-18 11:04:36 +02:00
Axel Uhl e92c01bfd4 coding conventions / whitespace change only
Change-Id: I8dedf7095e7817e1eda093e2b14a33db2cc2a07d
2017-06-18 10:50:47 +02:00
Axel Uhl de582f0be4 fixed inconsistencies with sm/h vs. kn vs. kts
Change-Id: Ib72649279d04f27dd71e602af8a2b9d9ea6e9489
2017-06-18 10:48:16 +02:00
Axel Uhl cfd0851f75 Merge remote-tracking branch 'server/master' 2017-06-14 11:27:35 +02:00
Kai Boernert 81ae14a622 fix for bug 4180 2017-06-14 11:04:08 +02:00
Kai Boernert 583a4f8c96 Merge branch 'master' into 60_inch
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2017-06-13 18:41:04 +02:00
Papick Garcia Taboada b2884319b3 Streamlined design 2017-06-13 17:38:45 +02:00
Papick Garcia Taboada c4b11ab6e2 Merge branch '60_inch' of ssh://sapsailing.com/home/trac/git into 60_inch 2017-06-13 16:03:51 +02:00
Papick Garcia Taboada 164260e66b Streamlined logic 2017-06-13 16:03:43 +02:00
Kai Boernert d07957882e prerace logic moved to auotplayhelper 2017-06-13 15:46:25 +02:00
Papick Garcia Taboada da40b9f250 Increased log statements for debugging 2017-06-13 14:45:19 +02:00
Papick Garcia Taboada 625f89c4f2 Fixed lastrace state 2017-06-13 14:42:32 +02:00
Papick Garcia Taboada b2839527a7 Now only using state from context 2017-06-13 14:21:31 +02:00
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
Axel Uhl de5a03e201 Merge remote-tracking branch 'server/master' 2017-06-13 12:46:14 +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