Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 684ad19abd Merge branch 'master' into ribdashboard 2016-02-23 14:35:31 +01:00
Axel Uhl 93b33e7cb2 Merge branch 'ubilabs--ios--develop' 2016-02-23 12:24:58 +01:00
Axel Uhl eaa17d60f0 incorporated changed from "jbross-poor-mans-wizard" in training presentation
Change-Id: I01b0843ad03a40b1ede5f4b0b81f2b1317146b7f
2016-02-23 09:51:59 +01:00
Axel Uhl 55560dc9f9 fixed typo in Javadoc
Change-Id: I161eeb1aa41c118b4c67433e2976181f41c06072
2016-02-23 09:51:41 +01:00
Axel Uhl 897c73ff21 Merge remote-tracking branch 'server/master' 2016-02-22 17:15:56 +01:00
Axel Uhl 64ace048da adjusted imports and Javadocs after making TracAPI impl packages invisible to using bundles
Change-Id: I274ecce3372bc61e6db146c734e94be6b3a98d16
2016-02-22 17:08:34 +01:00
Axel Uhl c1343888ed upgraded TracAPI from 3.1.2 to which we downgraded after trouble with 3.1.5 to 3.1.6
Change-Id: I9d3b066c868f269282c755de910afaf30160428c
2016-02-22 17:07:42 +01:00
Axel Uhl 7506ae5348 consolidated imports to avoid warnings
Change-Id: I70f9289f8eaada8fe8be1c94a89169dd15407bef
2016-02-22 15:45:41 +01:00
Axel Uhl b52806aec8 Merge branch 'master' into ubilabs--tracking_app--develop 2016-02-22 15:42:42 +01:00
Axel Uhl ce6cc3665f Merge remote-tracking branch 'server/ubilabs--tracking_app--develop' into ubilabs--tracking_app--develop 2016-02-22 15:42:26 +01:00
Axel Uhl 95d0576f72 replaced ... by … ellipsis Unicode character for Android apps as suggested by Lint warning
Change-Id: I9a978bb7880994be54eafafe73153b196500952c
2016-02-22 14:23:49 +01:00
Axel Uhl 21f818a686 replaced ... by … ellipsis Unicode character for Android apps as suggested by Lint warning
Change-Id: I940620f9b414bf4f1bf193bf1efe9ff768cb4a0b
2016-02-22 14:23:10 +01:00
Axel Uhl d84ca45822 Merge branch 'master' into ubilabs--tracking_app--develop 2016-02-22 14:07:04 +01:00
Axel Uhl 232d33abfc Merge remote-tracking branch 'server/master' 2016-02-22 14:00:37 +01:00
Axel Uhl 6de2038d28 Merge remote-tracking branch 'server/ubilabs--tracking_app--develop' into ubilabs--tracking_app--develop 2016-02-22 13:59:12 +01:00
Axel Uhl 4bf17fcd2a Updated building and deploying (markdown) 2016-02-22 10:48:18 +00:00
Axel Uhl 9ddb8ca5aa adjusted app name from "SAP Sail inSight" to "SAP Sail InSight"
Change-Id: If48826b40871e2e15abe6c54f9656c4f0e8a6236
2016-02-22 11:39:23 +01:00
Axel Uhl 6d453371eb consolidated imports, avoiding warnings due to unused imports
Change-Id: Ia0a8f467cc06ad2d5746cc9c5995e12e311b7d17
2016-02-22 11:37:59 +01:00
Axel Uhl fe5a7b3956 updated copyright in footer to read 2011-2016
Change-Id: I9d4d4475c80309d6fb3254ddfdbe5b59e4e5314f
2016-02-22 10:20:15 +01:00
Axel Uhl 7357f6faf5 reverting TracAPI back to version 3.1.2 for the moment according to Jorge's recommentation to avoid frequent deadlocks in TracAPI
Change-Id: If2ef201c71a0a37baaeab464ad179a2ded0159f5
2016-02-22 10:07:15 +01:00
Axel Uhl 2522a297b5 Merge branch 'ubilabs--ios--develop' 2016-02-19 21:47:12 +01:00
Axel Uhl 280904a2f9 removed unused imports to remove warnings
Change-Id: I748a4cfb62d6cbabb8733b01dfc7dabc9fcfa50b
2016-02-19 11:44:33 +01:00
Axel Uhl 09550a027c Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3077' into ubilabs--rcapp--bug-3077 2016-02-19 11:36:03 +01:00
Axel Uhl 25b4953a1c Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-02-19 11:35:43 +01:00
Axel Uhl 9d3d8d6162 Merge remote-tracking branch 'origin/jbross-poor-mans-wizard' 2016-02-17 23:58:46 +01:00
Axel Uhl f20534a6f1 added the leaderboard group drop-down to the dialog
Change-Id: I0c180a697c4469cf344044238afd29d238a9f91a
2016-02-17 21:35:35 +01:00
Axel Uhl 7ec53b0c44 adding dialog to link new regatta leaderboard to a leaderboard group of the event of which the regatta uses a default course area
Change-Id: I93238a8743c403fd03ff06f6d97d5e6706fa72bf
2016-02-17 18:25:42 +01:00
Axel Uhl 1d3d74ceed wait for event creation to obtain UUID which can then be used for non-name-based comparison
Change-Id: I24a9ef04b6cb2d9873c323365829c932a33b3956
2016-02-17 17:20:09 +01:00
Axel Uhl 448e36b998 validate leaderboard group create dialog after setting names programmatically
Change-Id: Ie4fe701478c6da14e3ad1d10ba72e77984d67566
2016-02-17 17:19:51 +01:00
Axel Uhl 244fea8c8d fixed default names for default event leaderboard group; fixed default focus on name field for event dialogs
Change-Id: I45a7c60bd5aa65f0d0a65ffefe019e5149d2b140
2016-02-17 14:44:05 +01:00
Axel Uhl bbd6fc1644 Merge branch 'master' into jbross-poor-mans-wizard 2016-02-17 14:12:30 +01:00
Axel Uhl 808524743c upgrade TracAPI to 3.1.5
Change-Id: I06559c2afcd382b5fae9e628de6d849bfef06c19
2016-02-17 11:58:24 +01:00
Axel Uhl b2e216b887 use port 1520 again for TracTrac tests; they forgot to upgrade the SAP-dedicated data server
Change-Id: Ia6719856194b1c4b55aab9ce8edee2917083f295
2016-02-17 11:57:58 +01:00
Axel Uhl 0cdf4b5b72 Merge branch 'master' into ribdashboard
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2016-02-17 00:20:45 +01:00
Axel Uhl a65d4ef3f6 Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop 2016-02-16 17:46:07 +01:00
Axel Uhl efae036047 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3077' into ubilabs--rcapp--bug-3077 2016-02-16 14:57:51 +01:00
Axel Uhl b5e39cabb4 removed old mark passing test stuff that Martin Hanysz once started with; it got obsoleted by Nick's work
Change-Id: I8f679a1c39ab1986a6b6e41dc6a65a7bdb5bb912
2016-02-15 23:09:05 +01:00
Axel Uhl a87cbdc8f0 fixing TracTrac test cases; no more port 1520/1521, and using new method to construct paramURL if nothing else is known (no more clientparams.php)
Change-Id: I453c6247d0b142215bd4039885e9898a0da8bfbb
2016-02-15 23:04:28 +01:00
Axel Uhl e3f8f87c7d fixed ParseTracTracJSONServiceOutputTest.testWeymouthURIsOnline by being more tolerant with HIDDEN races
Change-Id: Ie82b496cc56a87767f4f047e0e0af9631b64a731
2016-02-15 21:49:56 +01:00
Axel Uhl a6ccef32ca Merge branch 'bug778' 2016-02-15 21:17:54 +01:00
Axel Uhl d6a33d46ff Merge branch 'archive-hotfix' 2016-02-15 21:17:24 +01:00
Axel Uhl 2728034d38 adjusting border of maps settings button to new Google Maps 3.32 layout, reducing from 30px to 10px
Change-Id: I8054cda7a77c314932cbf5281cb93d6073f4de6a
2016-02-15 21:11:44 +01:00
Axel Uhl 9a96e75629 reduced visibility of new RaceMap methods required by ManeuverMarkerClickedListener; package-protected is enough
Change-Id: If5f10534d282a11797b2dce32dd96243e46607ed
2016-02-15 18:45:36 +01:00
Axel Uhl b0f0013d79 minor modifications in text messages and formatting
Change-Id: I65220d7ea7d0b1bad9b1dc43a51a939b23a95e17
2016-02-15 18:44:51 +01:00
Axel Uhl 144c5869c2 Merge branch 'master' into bug778 2016-02-15 17:53:30 +01:00
Axel Uhl 87a6829c43 Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-02-15 17:52:49 +01:00
Axel Uhl f2819e1f10 made licenses dialog compile properly in Eclipse
Change-Id: I3f59599db92d34a00e69f41aaa7bc5fc71f37ad0
2016-02-15 17:51:57 +01:00
Axel Uhl 96fce58d03 consolidated imports to get rid of warnings
Change-Id: I9f5b464a071118dbcdd22abe7673adfa58f2dc77
2016-02-15 17:50:33 +01:00
Axel Uhl 546385e995 upgraded TracAPI from 3.1.3 to 3.1.4, assuming to avoid an infinite loop for old events
Change-Id: Ide5d2f7f34c513588f84973b44b55f2c733bd7a6
2016-02-15 13:33:12 +01:00
Axel Uhl 9fb29e521e Updated ssl support (markdown) 2016-02-11 17:30:39 +00:00
Axel Uhl f9bad9570d Created ssl support (markdown) 2016-02-10 15:50:35 +00:00
Axel Uhl 804bf57496 Updated home (markdown) 2016-02-10 15:44:39 +00:00
Axel Uhl 50cb147a70 changed the default retrieval protocol for Amazon S3 file storage provider from http to https
Change-Id: Iaab40c735db54c78f5ec2cb4a5d946a8b6d5c0de
2016-02-10 16:35:57 +01:00
Axel Uhl d82466f5c7 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3077' into ubilabs--rcapp--bug-3077 2016-02-10 15:40:32 +01:00
Axel Uhl 32a0331ede Merge remote-tracking branch 'server/master' 2016-02-10 07:02:59 +01:00
Axel Uhl dec63406fb bug3422: extracted common transition handling parts into CanvasOverlayV3 and now also use it in CourseMarkOverlay
Change-Id: I284c2c25a40ccd3285c4695cb9bb32a7d218cf70
2016-02-05 15:09:47 +01:00
Axel Uhl ac9e60eda7 minor refactoring of ManeuverColor, using single point of exit pattern
Change-Id: I78e401c0dc189c216a1c1a0149a688d21092c275
2016-02-05 11:56:15 +01:00
Axel Uhl 78d5b65b85 slighly improved release notes
Change-Id: Ie6e1dda0944b43895e4fd679f83343451d33f20d
2016-02-05 11:41:01 +01:00
Axel Uhl 1a4d6f8b27 Merge branch 'master' into bug778
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html

Change-Id: I4452a526ac2470cb8423e2f2473823572ae97103
2016-02-05 11:38:54 +01:00
Axel Uhl 8e9f59bd03 Merge branch 'ubilabs--rcapp--bug-3077' into ubilabs--rcapp--develop 2016-02-05 11:02:46 +01:00
Axel Uhl ff1bd7a2d4 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3077' into ubilabs--rcapp--bug-3077 2016-02-05 11:00:08 +01:00
Axel Uhl 265dc12620 Merge branch 'master' into ubilabs--rcapp--bug-3077
Change-Id: Idd08104ad56ab1e5c17770772d55ff4cc465c988
CR-Id: 012006153200000679212016
2016-02-04 23:24:02 +01:00
Axel Uhl 2548aed407 Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-02-04 23:20:49 +01:00
Axel Uhl 38644b972d Merge branch 'master' into ubilabs--rcapp--bug-2760 2016-02-04 22:12:50 +01:00
Axel Uhl fefd69cc4f Merge remote-tracking branch 'server/master' 2016-02-04 17:09:19 +01:00
Axel Uhl 3b8127dd08 fixed typo in method name
Change-Id: I2450527864a1be9dfcd35326a17bcdb292a095e6
2016-02-04 17:06:45 +01:00
Axel Uhl 56832ae6e8 Merge branch 'archive-hotfix' 2016-02-04 16:58:19 +01:00
Axel Uhl e0766e5246 reduced race times panel margins to 3min before and 1min after race
Change-Id: Iadf8ce656ac39426525b5026cd6f4e178af9343e
2016-02-04 16:57:46 +01:00
Axel Uhl 320d0c84e5 Merge remote-tracking branch 'server/master' 2016-02-04 16:08:09 +01:00
Axel Uhl c4a9e48bb5 fixed synchronization bug regarding leaderboard list in leaderboard group;
the issue was related to the syncGroupsAfterLeaderboardChange method which was based on the assumption that there may be
changes in Leaderboard Java object identity while still meaning the same leaderboard. This would have forced a replacement
of listeners and an update of the leaderboards list in the LeaderboardGroup. Furthermore, LeaderboardGroup used to refer to
the leaderboard by name in the database. This forced an update to the persistent copy of the leaderboard group when the
leaderboard's name changed. Today, this link is based on a MongoDB ObjectId, so no update of the leaderboard group is
necessary any more.

The root cause was a threading issue: iterating over a copy of the leaderboards list of the leaderboard group, then
looking for the old position of the leaderboard in that list, then removing it, then adding it again at the old index.
If this is not atomically locked (which it used to be up to commit 118f03fbb5 when
coarse-grained synchronization was replaced by more fine-grained locking inside the LeaderboardGroupImpl methods) then
one of two concurrent removals for the same leaderboard may not find the leaderboard anymore, yet the second add is
carried out, leading to a duplication; or the first thread gets the index before the second thread removes; then
the first thread adds at an incorrect index.

Change-Id: Ib47ba715c77221fa353fa4669662e5f48d8e5857
2016-02-04 16:01:11 +01:00
Axel Uhl b680c0baf7 Merge remote-tracking branch 'server/master' 2016-02-03 22:43:29 +01:00
Axel Uhl adc4cea5b9 Describing the Android release / deploy build process. 2016-02-02 23:00:13 +00:00
Axel Uhl 40aca3ea2f More hints on getting an MiOS build/deploy/handover done 2016-02-02 22:33:29 +00:00
Axel Uhl 8b488c0478 Describing the iOS build 2016-02-02 21:52:17 +00:00
Axel Uhl 1bc29a9ec0 bug 3452: introducing an applyFilter parameter on DynamicTrackedRace.recordWind, forcing RaceLog-provided wind fixes into the race
Change-Id: Ie96ac8537650adb46285ebcc18a91dc70a6f7582
2016-02-02 21:14:43 +01:00
Axel Uhl bda7a900c7 Merge remote-tracking branch 'server/ubilabs--ios--develop' 2016-02-02 16:36:16 +01:00
Axel Uhl e6289470e8 Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-01-30 21:12:41 +01:00
Axel Uhl dccac572f8 don't add regatta log-provided competitors if no race exists; only collect competitors from race columns
Change-Id: Icd2843aba1d374cb3ac55b3575ec22e734ab9ec0
2016-01-30 21:11:44 +01:00
Axel Uhl 782803ed62 Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-01-30 17:36:10 +01:00
Axel Uhl c985c18c86 consolidated imports to avoid warnings
Change-Id: Ib94311d8c96ba4474d4509010c51ab97f3cd369d
2016-01-30 17:32:23 +01:00
Axel Uhl d50e1a73fd added logic and test case for bug 3448: invalidate competitor cache and compute competitors from reagtta log if no race columns exist yet
Change-Id: Ica3d9fe0e032cce30389a55f2d1d4ad0fc7cd9bf
2016-01-30 17:19:41 +01:00
Axel Uhl 75c658cb21 Merge branch 'bug3446' 2016-01-30 15:13:21 +01:00
Axel Uhl 933c9128db added forwarding rule for RegattaLogEvent on AbstractSimpleLeaderboardImpl
Change-Id: I58758c4b7eb7a589090981383587d709a13f34e6
2016-01-30 15:12:40 +01:00
Axel Uhl fe1bf844a8 fixing bug 3448: trigger event when regatta log events are added and use to invalidate leaderboard DTO cache
Change-Id: Ib4a91d1ab8d58e07a845852cffd0f99d59b29544
2016-01-30 13:24:09 +01:00
Axel Uhl 5a5a74075b "cherry-picked" the admin training presentation from ubilabs--rcapp--bug-3077 onto master
Change-Id: I717da07219848d95c10871e5421c25869ec7adf7
2016-01-30 12:51:34 +01:00
Axel Uhl e43f85537c more i18n support; focus identifier text field in create config dialog
Change-Id: Iaaff7d66d2969a14450b6f03dd04de741616fab6
2016-01-30 12:43:50 +01:00
Axel Uhl 209066b87b fix for bug 3446: entity identity comparator for device configurations now compares the list of device names
Change-Id: I72f7d20cdb95d64cc403e7645f46c86a3f8c8384
2016-01-30 12:33:27 +01:00
Axel Uhl c0f30fd545 removed "MULTI" device configuration stuff which was unused
Change-Id: Ie27a13acdf84c6978f26ecef362df58f3514e967
2016-01-30 12:14:21 +01:00
Axel Uhl cb3e6aa94e fixed several i18n issues around DeviceConfigurations in AdminConsole; use MarkedAsyncCallback in more places
Change-Id: Ifb0ba3fde55340595d3c87ed951d94d262e5ef48
2016-01-30 11:35:43 +01:00
Axel Uhl d20d758075 final version of admin training presentation as used at BYC in Starnberg
Change-Id: I51df9b4e3abd9ecf0a90dc1ee5fc8d5f637af2cf
2016-01-30 10:41:52 +01:00
Axel Uhl d8792bec21 consolidated import, avoiding warnings
Change-Id: If6ff7957a7a268b38b4cb6719d8e91cd5b985846
2016-01-29 10:20:09 +01:00
Axel Uhl e7c80b98a7 fixing licensesdialog project settings to get Eclipse compile under control
Change-Id: I3ce093dbb6aa3b48f6e10f8cf7c5fbfd31bfc32f
2016-01-29 10:17:58 +01:00
Axel Uhl 91f8a9799d "merging" the training presentation into master
Change-Id: I44931946b0a1d93626d91606e07897356501c379
2016-01-29 00:16:52 +01:00
Axel Uhl 61912b9aff saved training presentation again
Change-Id: I535600af880cd11a503b77c69e2d3cb74f8bcffc
2016-01-29 00:16:15 +01:00
Axel Uhl c340e3535a adding section on split-fleet competitor assignment
Change-Id: I7ba08748aa5f0e5b0d559415b88fd321b5905fda
2016-01-29 00:03:11 +01:00
Axel Uhl aed8d3ac48 completed first round of smartphone tracking for single fleets
Change-Id: I1ecaa3b3364cd1d1b44d8d3dd13a15429c8b2554
2016-01-28 23:24:43 +01:00
Axel Uhl e2638f2c2b Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-01-28 22:18:11 +01:00
Axel Uhl f196f13aef added -Djava.awt.headless=true to ADDITIONAL_JAVA_ARGS in start script to avoid issues with DISPLAY variable and QR code generation
Change-Id: Ic502069d60b8c2f8070d9966d28076491963ca70
2016-01-28 22:17:20 +01:00
Axel Uhl 43ff265306 explained binding competitor and mark phones
Change-Id: I3e76fd77e62b491a73b99626496eb07b94074b08
2016-01-28 22:16:41 +01:00
Axel Uhl cc6df8b21e Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-01-28 21:45:37 +01:00