Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 58fe2b8342 simplified MediaLibrary.updateMapByRace_Add
Change-Id: I65770d2c145ef8500d71d6374357028791f10375
2016-06-07 11:58:14 +02:00
Axel Uhl 2f5d6813b9 whitespace change only
Change-Id: Iff02931084b336f366a22d5b471e83994cd21ec7
2016-06-07 11:54:49 +02:00
Axel Uhl d27f243d3a added assert statements that validate constraints in MediaLibrary so far expressed only as a comment
Change-Id: I4ee9e5dc0f0c60ec1e6216e3b2b39ac766c13f0b
2016-06-07 11:53:35 +02:00
Axel Uhl 1415f61d16 formatting only: spaces, not tabs
Change-Id: Id25edad75463aafbb868cccdf2d01c2ca0e3718e
2016-06-07 11:25:26 +02:00
Axel Uhl 5d9a1489ad Merge remote-tracking branch 'server/master' 2016-06-03 17:44:33 +02:00
Axel Uhl 592c44e880 introduced command line options for uploadRepositoryToServer.sh for proxy/tunnel upload
Change-Id: Ib35d0de686c9f4f6660726a5a4bb9fbc69457933
2016-06-03 15:51:39 +02:00
Axel Uhl 91ce2c2d55 Merge branch 'bug3683' 2016-06-03 12:05:06 +02:00
Axel Uhl 337ce15ef1 formatting changes only
Change-Id: I43c8bf3de168ffe02e2bb1d05a6b89c387969151
2016-06-03 12:04:57 +02:00
Axel Uhl 341086ff54 fixing NPE issues for XML exporter in case a race has no valid end of race; sampling five wind fixes then
Change-Id: Ieeb8148f04ae2e9bc767a4c34d032ed2f6d3d76b
2016-06-03 10:45:48 +02:00
Axel Uhl a0cc588055 upgraded target platform: org.apache.servicemix.bundles.aws-java-sdk-1.9.8_1.jar replaced by org.apache.servicemix.bundles.aws-java-sdk-1.10.73_1.jar
Change-Id: If049def19299fbfba6ea27f30345b0c6a70b4ef6
2016-06-03 09:19:09 +02:00
Axel Uhl 51bab1b93f fix for bug 3682: remove a leaderboard group from all events referencing it when removing the leaderboard group
Change-Id: Ifa4a66202a1506c42f74c29037e052fad95ba053
2016-06-01 17:42:07 +02:00
Axel Uhl d1af28800d fix for bug 3681, "greening" the test: removing an overall leaderboard from the server unlinks it from the respective leaderboard group
Change-Id: Id23a781a2e640d8ee68d68e6dae2ec2e85b30a82
2016-06-01 17:34:56 +02:00
Axel Uhl fecedb380a added failing test case for bugs 3681 and 3682
Change-Id: I1d4fa2061b3ff0afecc4f9e8f5d5aeabd5ad3599
2016-06-01 17:29:11 +02:00
Axel Uhl bf7dfa7a6e Merge branch 'ubilabs--tracking_app--bug-2779' 2016-06-01 11:47:47 +02:00
Axel Uhl 57c7ac1e70 consolidated imports
Change-Id: I0d7e02d567db06c70d2aaf718ca8c9011509ad69
2016-05-30 18:24:16 +02:00
Axel Uhl fcd653b822 fixed search test cases which now require the Event--LeaderboardGroup--Leaderboard association to be maintained properly
Change-Id: I84d4b864d5ea25d3e507b0b6ad876f7ba74c4eb1
2016-05-30 18:22:20 +02:00
Axel Uhl 48c85b8ba4 copied _zh_CN to _zh
Change-Id: Ie8a0963f878d9f1f86bb505143f16ce836219f67
2016-05-30 17:18:39 +02:00
Axel Uhl fe1da11be5 Merge branch 'translation' 2016-05-30 17:17:23 +02:00
Axel Uhl 8afe0b2ad9 fixing XML export for rank gains, using previous leg's finishing rank instead of current leg's rank at leg start
Change-Id: I2686f70aa8f3fb6a711c6491529ae179f3d2c7e7
2016-05-30 12:17:57 +02:00
Axel Uhl aa919b3433 Merge remote-tracking branch 'server/master' 2016-05-30 12:17:25 +02:00
Axel Uhl 53827a9359 fix for searching public events / leaderboards only (bug 3676)
Change-Id: I375fefcac041b3193b5768fca435c4a7032375a3
2016-05-30 12:10:14 +02:00
Axel Uhl 46d8ea8333 adjusted Javadoc
Change-Id: I8704d7eecb153ce789d2bc959135f37c11676de7
2016-05-30 11:03:05 +02:00
EC2 Server fefad09457 changed chmod 777 to 000-macros.conf so that httpd can read it 2016-05-29 11:29:33 +00:00
Axel Uhl 81620b3850 added "Platu25" as an alias name for "Platu 25"
Change-Id: I4c8a7cb794b9ba93525bf018891f00fb0724e4a7
2016-05-28 23:47:09 +02:00
Axel Uhl 2ae8a6b0c1 fixing "None" passing instruction for single mark start/finish waypoint
Change-Id: Iebce0c1e9fba5940829fedf1bbedfba15c60936c
2016-05-20 17:56:37 +02:00
Axel Uhl b314220429 fixed bug 2418 by checking single mark start/finish correctly now
Change-Id: Iff23d9b11fb04753fd60cc9ae829fdc4fd0fe12a
2016-05-20 17:31:08 +02:00
Axel Uhl a60221d2e5 Merge branch 'translation' 2016-05-20 11:37:05 +02:00
Axel Uhl a598da9b18 removed obsolete parameter Javadoc
Change-Id: I89f4fb76c325cfb952061bb738c11d2c66e5d4ac
2016-05-20 11:36:54 +02:00
Axel Uhl 37f62dad20 copoied _zn_CN.properties files to _zh.properties
Change-Id: Iece7510c447299672099af91c5227c1331c0bcc4
2016-05-19 18:44:12 +02:00
Axel Uhl 39c7d5b86c Merge remote-tracking branch 'origin/translation' into translation 2016-05-19 18:39:26 +02:00
Axel Uhl aeddc9922a bug 2779: fixing the initial texts for COG/SOG display in tracking app, using resources instead of redundant constants
Change-Id: I72e41ff8919b843063c0b3456928ca6b2d50a131
2016-05-19 18:06:17 +02:00
Axel Uhl 38ace3a979 removed dependency of gwt.ui on gwt.theme which no longer exists
Change-Id: I59a8ce3fa4db229fe9a89e6d4499821b1ad3a363
2016-05-19 16:30:31 +02:00
Axel Uhl 4c52f78efc Merge remote-tracking branch 'server/master' 2016-05-19 16:29:46 +02:00
Axel Uhl f3d5bdcf27 adjusted race management app release notes
Change-Id: I8908bf2731982c7f1780cf9d5dd045fe9e2e57dd
2016-05-19 16:22:28 +02:00
Axel Uhl 257bf67982 Merge branch 'ubilabs--rcapp--bug-3659' 2016-05-19 16:14:31 +02:00
Axel Uhl ff2c6cb9ce Merge branch 'bug3658' 2016-05-19 12:57:57 +02:00
Axel Uhl 1177c0b086 fixed forwarding of waitForGPSFixesToLoad parameter; eliminated if-clauses originally described as problematic in bug3636 2016-05-18 22:40:18 +02:00
Axel Uhl 56f1ff8767 more tests and fixes for bug 3636
Change-Id: I4b2b8e55e787cfbafd598b95d3ae7566fceecd89
2016-05-18 15:50:25 +02:00
Axel Uhl 370a5c8b59 failing test case for bug3636
Change-Id: I2d929b9e6998cced903116884e04ba09469a9588
2016-05-18 15:10:25 +02:00
Axel Uhl d2420dc058 whitespace changes and a few renames for identifiers with typos in them
Change-Id: I382e6f906b8aabf636a0525aa5b9372ee83a0807
2016-05-18 13:55:42 +02:00
Axel Uhl 376808122a Merge remote-tracking branch 'server/master' 2016-05-17 17:28:29 +02:00
Axel Uhl a9f586ad6f avoid disabling "Add Media" URL field during Youtube probing; support file: protocol as non-Youtube indicator
Change-Id: Idc6763ed5bba9febf7ec50f14005c31c2ce794cc
2016-05-17 17:07:47 +02:00
Axel Uhl ba7e502833 avoid disabling "Add Media" URL field during Youtube probing; support file: protocol as non-Youtube indicator
Change-Id: Idc6763ed5bba9febf7ec50f14005c31c2ce794cc
2016-05-17 17:06:28 +02:00
Axel Uhl 966a2a6435 fixed synchronization for progressDialog in AbstractBaseActivity; see bug 3658
Change-Id: I43cb673d1ca3f53757dd5b1c6c781293a85edd1a
2016-05-17 15:44:05 +02:00
Axel Uhl 6bb120a567 Merge branch 'master' into bug3658 2016-05-17 15:41:15 +02:00
Axel Uhl 4aa46db498 declare Android support-v7 libs as 1.7 compiler level 2016-05-14 21:50:21 +02:00
Axel Uhl da0335eae8 Merge remote-tracking branch 'server/master' 2016-05-14 21:46:50 +02:00
Axel Uhl 545256d028 added preference files for Android source projects
Change-Id: I7bbf64bb5fcc51407462b63ef6411df44bf802d4
2016-05-14 21:46:23 +02:00
Axel Uhl 977c9fb55f Merge remote-tracking branch 'origin/master' 2016-05-14 21:43:57 +02:00
Axel Uhl d78481cf6c fixed paths in racecommittee.app/project.properties from Windows to portable Linux convention 2016-05-14 21:39:12 +02:00
Axel Uhl eea419294a Merge remote-tracking branch 'server/master' 2016-05-14 11:12:58 +02:00
Axel Uhl bb5bef59ae use ListBox value instead of itemText to preserve leading and trailing blanks of event names; bug 3661
Change-Id: I4c5f226a698b667252f94f7bfa63097fcb0ce1c5
2016-05-14 11:09:46 +02:00
Axel Uhl 4e3ad78640 turned method monitor object from Object to String to ensure serializability 2016-05-14 08:37:04 +02:00
Axel Uhl 50c72deb62 Merge branch 'master' into bug3657 2016-05-14 00:02:34 +02:00
Axel Uhl 4ae2566e0d updating the start time was now buggy on bug3657: when no race log is attached, non-null start time would remain unchanged
Change-Id: If74aa071ffca80781dcb673d8cca0fa63d1c4387
2016-05-13 23:59:23 +02:00
Axel Uhl 7aadb0a48e whitespace changes only
Change-Id: I616b32ec9f83ec664311be03a57e351ed3c340f8
2016-05-13 21:59:16 +02:00
Axel Uhl 07b11496c1 Merge branch 'master' into bug3645 2016-05-13 21:50:13 +02:00
Axel Uhl 64f2721563 Merge branch 'bug3660' into bug3657 2016-05-13 21:34:38 +02:00
Axel Uhl ead8e0dc46 removed a redundant call to invalidateStartTime in setStartTimeReceived
Change-Id: Ibd7841cc56ca8e71f121f4b613244861e05787cb
2016-05-13 21:34:14 +02:00
Axel Uhl b401df2276 force invalidateStartTime() when startTimeReceived is updated
Change-Id: I247eb474344b07da59c0812631f84f88e6dc93cd
2016-05-13 21:30:51 +02:00
Axel Uhl 95b509b5b8 Merge branch 'bug3660' into bug3657 2016-05-13 21:18:02 +02:00
Axel Uhl ff524f9808 bug 3660: materializing the startOfRace result in startTime in all cases; respond from cache; notify changes based on cache
Change-Id: I4362bc2a6b7513b3da10731a0a2299ad69f6a4fe
2016-05-13 21:15:30 +02:00
Axel Uhl a31b946b78 fixed a typo in a comment
Change-Id: Ie1688561d2f7c4fa4f1f67d2653e05fb52786b9f
2016-05-13 20:42:23 +02:00
Axel Uhl 468e7fbfc4 more parallelization across competitors for computing mark passing deltas
Change-Id: I444abf12289b1ad8a85466ac29f0ccc1e0558a5a
2016-05-13 19:57:26 +02:00
Axel Uhl 2ca0f358ab fixed setting of end proxy's waypoint index (+1 was missing)
Change-Id: Iecd52c8bce353fcc2590f32335e8e724e2d1b1b7
2016-05-13 19:56:51 +02:00
Axel Uhl f2a687fdd9 don't maintain the end proxy node's index in addWaypoints and removeWaypoints anymore; updated it under the course read lock
Change-Id: I9ecb6b4574a025bbe03a51e772951ba9844e1aa1
2016-05-13 18:36:13 +02:00
Axel Uhl 0650d96b77 introduced a bit more concurrency across the competitors in the MarkPassingCalculator; they are independent of each other
Change-Id: I26eb9bc5f871e8b223dc936139e350d61ef1e0f5
2016-05-13 18:24:49 +02:00
Axel Uhl 490e65000b synchronizing the dismissal of the progress dialog to avoid exceptions in concurrent / asynchronous situations
Change-Id: I208c2d4cb4ce932b470d34c7de65b5320d391ef5
2016-05-13 16:54:58 +02:00
Axel Uhl b58adebaad using multiple threads from an executor service to calculate mark passing/candidate updates in parallel for multiple competitors
Change-Id: I1797eb7f927b4a497384bbc5347e3b41c2c8c9ee
2016-05-13 15:47:27 +02:00
Axel Uhl 72c0f33265 more documentation at the end of releaseAndroidApps.sh
Change-Id: I37fb0a0b6b70b6847486d8c4957f9610d7c6142e
2016-05-13 14:10:46 +02:00
Axel Uhl 3f4fbc82b6 added some final explanations to the releaseAndroidApps.sh script
Change-Id: Ia3e1f64983f13e87e0d259293d9a1bc5e7640689
2016-05-13 14:07:35 +02:00
Axel Uhl e3f7d44a6a "cherry-picked" AndroidManifest.xml files from android-xmake-release to master to align versions again
Change-Id: I2edfb1b681437ed784038ee6891e6eee1270db18
2016-05-13 14:03:04 +02:00
Axel Uhl bb132d724b extended admin console release notes
Change-Id: I36a9af1fc77a74afab2a694b3bc8fdbf881e956e
2016-05-13 12:48:38 +02:00
Axel Uhl 4821504f76 added M32 to list of boat classes that get a 32' catamaran as vector graphics
Change-Id: I01b23647163d6bed8382f4b915b53b3e2e513df9
2016-05-13 12:41:11 +02:00
Axel Uhl 7f28516089 fixed ensligh "Set Position" button label string
Change-Id: I45c8307c95daf1fa8e8d478a9cb4975793789d9f
2016-05-13 09:32:16 +02:00
Axel Uhl b088446f2f Merge branch 'master' into ubilabs--tracking_app--bug-3575 2016-05-13 09:25:34 +02:00
Axel Uhl 9004114cfc describe the effects of bug3624 in race management app release notes
Change-Id: I1ebaaba3d936bd1d56d844d165a0d68091fa90d8
2016-05-13 09:04:59 +02:00
Axel Uhl 27476cc851 Merge branch 'master' into ubilabs--rcapp--bug-3624 2016-05-13 08:37:42 +02:00
Axel Uhl 96235b08cc Merge remote-tracking branch 'server/master' 2016-05-13 00:38:34 +02:00
Axel Uhl 38e0ea2ce5 fixed issue with null TimePoint and Candidate comparator; was problematic for proxy (start/end) node candidates with null TimePoints
Change-Id: Ic0b00d0d64ebe8e67e423cebb31f0e85a0f67c18
2016-05-13 00:37:52 +02:00
Axel Uhl 0ff1b8dbb5 fixed typo in Javadoc
Change-Id: I0a7f9448a87d7a88b9a3f4b959675e864f16d7b9
2016-05-13 00:37:25 +02:00
Axel Uhl c433665fad refresh waypoints each time the mark passing panel is opened
Change-Id: I0653b48f717a7b7ff97365288eae7475857005c3
2016-05-13 00:05:44 +02:00
Axel Uhl 14d8e93fdf improved error handling for GPS file import
Change-Id: I4941d73475c6ed3ce8df61210b0161f0ac197303
2016-05-12 23:01:22 +02:00
Axel Uhl fbb1a102d7 script to convert specific CSV file format to GPX format
Change-Id: Icc737f3319b486c73031b01b1488148ec7971571
2016-05-12 23:00:44 +02:00
Axel Uhl b36bd3c677 Merge remote-tracking branch 'server/translation' into translation 2016-05-12 18:51:41 +02:00
Axel Uhl ad96b7963a copied _zh_CN files to _zh files after import from TEW
Change-Id: I26b5659a39e8384b671699ce2338d55e4d455922
2016-05-12 18:50:04 +02:00
Axel Uhl d16e46d02f Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
2016-05-12 18:46:17 +02:00
Axel Uhl 1b9423c974 Merge remote-tracking branch 'server/master' 2016-05-12 14:14:44 +02:00
Axel Uhl ae02ba8a9d made the synchronization for mark passing calculator finishing timing independent
Change-Id: I848da90ecf1451bbc9572fe4662022c69f7899fc
2016-05-12 14:08:34 +02:00
Axel Uhl 869abfcca9 Merge branch 'master' into bug3632 2016-05-12 13:50:47 +02:00
Axel Uhl 45fcd2f44f Mentioned ANDROID_HOME classpath variable for Eclipse 2016-05-12 11:50:25 +00:00
Axel Uhl 4865820046 fixing bug 3650 by using the top-level document's ClassName field for the boat class creation
Change-Id: I92a07396718db0393fe2034390eba008061be5a8
2016-05-12 13:45:08 +02:00
Axel Uhl e6ca196556 search for Shiro exception in SerializationException message to improve error response to client
Change-Id: Id7925ce44ee4737c15d5c765a2bbf8de6bdeb8b0
2016-05-12 13:35:56 +02:00
Axel Uhl e3a5ab9957 cleaned string messages, removing extra whitespace
Change-Id: I42deb841e37c7004e9e85239bce2a048402a7460
2016-05-12 10:57:04 +02:00
Axel Uhl 687519f223 added a few TODOs for alternatively mapping devices to marks instead of competitors 2016-05-12 08:35:40 +02:00
Axel Uhl 9bd0b64c62 Merge branch 'master' into translation 2016-05-12 07:24:16 +02:00
Axel Uhl d627d0f434 fixed DurationTest verdict for asHours()
Change-Id: Ib180aa2bf653a6d579bdc98ba61e8377b2bd3348
2016-05-12 07:23:39 +02:00
Axel Uhl 063c8d5ed5 Merge branch 'master' into translation 2016-05-11 23:43:59 +02:00
Axel Uhl bd020bf5d0 Merge branch 'bug3648' into bug3632 2016-05-11 18:47:20 +02:00
Axel Uhl 5985aad653 fixed DurationTest verdict for asHours()
Change-Id: Ib180aa2bf653a6d579bdc98ba61e8377b2bd3348
2016-05-11 18:47:03 +02:00