Commit Graph
33855 Commits
Author SHA1 Message Date
Axel Uhl b9dd5f2aa2 Merge remote-tracking branch 'server/bug3727'
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java

Change-Id: I56bd30b78ffd28daa26793415351938e07af7ae9
2016-07-14 22:12:36 +02:00
Axel Uhl 6755744183 Merge remote-tracking branch 'server/bug3741' 2016-07-14 22:01:39 +02:00
Axel Uhl 37f1ff20e1 Merge branch 'ubilabs--tracking_app--bug-2688' 2016-07-14 21:58:28 +02:00
Axel Uhl 8d3df4fc17 use normal priority for data mining threads
Change-Id: Idcc2c1d4d64df766d80effe39c92b6209939de2d
2016-07-14 21:51:17 +02:00
Axel Uhl 012fcb586f use a thread factory creating daemon threads in DataMiningExecutorService
Change-Id: I2661605711b82c43f1bd2bbf8b7ec51babcf52f7
2016-07-14 21:50:26 +02:00
Benjamin Barth 03e8435544 Merge remote-tracking branch 'origin/raceboardmodes' into predefined-analysis 2016-07-14 16:31:00 +02:00
Axel Uhl 5f1978aaf4 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-14 16:27:06 +02:00
Axel Uhl 51fbcae88d in Igtimi WebSocketConnector handle the case where client is null
Change-Id: I64f5e8cd4adaef72ac02df05784edf0c19c504f4
2016-07-14 16:24:01 +02:00
Axel Uhl 04cd1627b3 account for the possibility that the leaderboard is not yet defined
Change-Id: I4f9a634f6203061ab52fea22895964d4d2aa529f
2016-07-14 16:23:43 +02:00
Axel Uhl 79448ce4f4 when showing boats on the map, filter by current getCompetitorsToShow() as it may have changed since an asynchronous call was made
Change-Id: Ibfa144153dda911e5d5bc8425cea27c4775c789e
2016-07-14 16:22:53 +02:00
Benjamin Barth 8477df8e06 Restricted RaceviewerLaunchPad access in racelist to button only 2016-07-14 16:04:04 +02:00
Axel Uhl af293f2f90 trigger listeners on RaceCompetitorSet properly
Change-Id: I1321e386344d13601220a1e318cf8233a026434c
2016-07-14 16:01:53 +02:00
Benjamin Barth a8d7ec4069 Adjusted RaceviewerLaunchPad positioning base on space above/below 2016-07-14 15:53:31 +02:00
Axel Uhl bddefaa3cb don't set null as selection when the LeaderboardPanel doesn't find a row for a competitor that was selected in the underlying selection model
Change-Id: I964a9c1189ff1e1ab0e5d131a360582f431d0603
2016-07-14 15:25:23 +02:00
Axel Uhl 5cf8f4c21c for split-fleet races, race board modes now should correctly identify the top-N competitors within the pre-selected race
Change-Id: Ie7f6f4cce683d8f7639c131bd374b02e4c0bd177
2016-07-14 14:55:13 +02:00
Peter Siegmund 3c1e5880c8 moving global members into viewHolder which is attached to the convertView (setTag) 2016-07-14 14:42:38 +02:00
Bennet Brunsen 9f1e1b44ea Fix bug in main list loader 2016-07-14 14:22:36 +02:00
Bennet Brunsen e17a1a0675 Display competitor, mark and leaderboard in main list 2016-07-14 14:22:36 +02:00
Bennet Brunsen cf835ade18 Prepare database to access mark name and competitor name for regatta list 2016-07-14 14:22:36 +02:00
Peter Siegmund 100e7b0e52 don't reset header view in NavDrawer if convertView is same on notifyDataChanged call 2016-07-14 13:43:06 +02:00
Peter Siegmund 5683485d70 fixed spelling 2016-07-14 11:54:05 +02:00
Peter Siegmund aee09b171b Merge branch 'master' into bug3727 2016-07-14 11:13:46 +02:00
Benjamin Barth 7b0bb63f6d Adjusted positioning of RaceviewerLaunchPad for race list entries 2016-07-14 11:04:49 +02:00
Peter Siegmund 5d80ec70a5 move race registration into ManagedRacesDataHandler und unregister to InMemoryDataStore 2016-07-14 10:19:46 +02:00
Benjamin Barth ef62c0427f Adjusted RaceBoardModes integration for RaceviewerLaunchPad link URLs
and added i18n messages
2016-07-14 10:19:22 +02:00
Benjamin Barth c642ac1e6c Integrated RaceBoardModes to RaceviewerLaunchPad link URLs 2016-07-14 09:53:31 +02:00
Benjamin Barth ea3f8fa624 Merge branch 'raceboardmodes' into predefined-analysis 2016-07-14 09:19:00 +02:00
Benjamin Barth 8af77a9671 Merge remote-tracking branch 'origin/master' into raceboardmodes
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2016-07-14 09:09:39 +02:00
Benjamin Barth b13b3be3f8 Merge remote-tracking branch 'origin/master' into predefined-analysis 2016-07-14 08:38:10 +02:00
Peter Siegmund fd2a3b7dd0 Merge branch 'master' into bug3741 2016-07-14 08:12:51 +02:00
Axel Uhl a30acdc45f Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-13 21:14:19 +02:00
Axel Uhl 5c350d6f8a turned all Timer usages into daemon threads to ensure clean VM shut-down
Change-Id: I933cda5e4a9b6b5c9f7a7090e0dad9b00154bd35
2016-07-13 18:34:16 +02:00
Axel Uhl abd40620b7 german translation of the instructions for the Race Manager app
Change-Id: Ibf30a89784299d89cbf6fafbffd56828ff3feb16
2016-07-13 18:17:22 +02:00
Benjamin Barth 2d24e757a7 Integrated race viewer predefined analysis to competition format 2016-07-13 18:16:44 +02:00
Axel Uhl 92b6bc192d upgraded TracAPI from 3.2.0 to 3.2.1, fixing issue with hanging subscriber threads
Change-Id: Iaf84e0f0d45b9bfda67c0529934f9ecb51c2ca8b
2016-07-13 18:02:55 +02:00
Axel Uhl 8c3e2ec0a2 Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-2688' into ubilabs--tracking_app--bug-2688 2016-07-13 17:57:00 +02:00
Axel Uhl ba8f731904 Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-13 17:56:36 +02:00
Benjamin Barth 666280b8d0 Adjusted competition format races for predefined analysis menu 2016-07-13 15:26:52 +02:00
Axel Uhl ed28a559aa removed listDataProvider field from RefreshableSingleSelectionModel where it seemingly wasn't needed
Change-Id: Iab920a920d3086abf29e9a847f433432106d9e48
2016-07-13 12:59:15 +02:00
Axel Uhl 97e044cbb6 Merge branch 'master' into bug3725_2 2016-07-13 11:37:02 +02:00
Axel Uhl 35b368b7e4 fix for bug 3780 part 2
Change-Id: Ifa574e4ff70e9f73fa968f159fa6d57947d3b4da
2016-07-13 11:19:51 +02:00
Axel Uhl c7648331bd wired the RS* and Splash boat class icons in BoatClassImageResolver
Change-Id: If46cc3a7205e2893c332b4cc86fb415db7389051
2016-07-13 10:32:03 +02:00
Axel Uhl 38c459e3ff fix for bug 3780: NPE due to an issue with a null/null time range when a competitor was added to a selection for charting
Change-Id: Ie8373c829c2dd3ae5cb81aa6a870662c3e99b8c6
2016-07-13 10:19:02 +02:00
Axel Uhl cc903f0522 for raceDetailsExecutor use a thread factory that produces daemon threads
Change-Id: I8f0a69aa11f02514346e62b1bd0378ed560e764a
2016-07-13 10:16:46 +02:00
Axel Uhl ebe8191da2 Merge branch 'master' into raceboardmodes 2016-07-13 00:20:55 +02:00
Axel Uhl fe4273739c Merge remote-tracking branch 'server/master' 2016-07-13 00:15:59 +02:00
Axel Uhl e4fcb163f8 added boat class logos for RS?00, RSAero and Splash boat classes
Change-Id: Ifcf9f5a5c5f06648a1f000f31b14120597d5b100
2016-07-13 00:04:11 +02:00
Lukas Furmanek 299c06a7b4 added JavaDoc and renamed a method 2016-07-12 19:13:49 +02:00
Lukas Furmanek f0792807a9 Merge remote-tracking branch 'server/master' into bug3725_2 2016-07-12 18:53:54 +02:00
Benjamin Barth 17a7acd125 Integrated race viewer predefined analysis to desktop race lists 2016-07-12 18:14:51 +02:00