Commit Graph
33029 Commits
Author SHA1 Message Date
Bennet Brunsen 2f6eb22150 Merge branch 'ubilabs--rcapp--bug-3525' into ubilabs--rcapp--develop 2016-06-09 11:44:39 +02:00
fmittag 668f664d5c Merge remote-tracking branch 'origin/bug2610_componentid' 2016-06-08 19:24:33 +02:00
fmittag c84985bc9f Merge remote-tracking branch 'origin/master' into bug2610_componentid 2016-06-08 17:08:06 +02:00
Peter Siegmund eb26d5913e removed minimal top margin for the countdown timer 2016-06-08 14:01:25 +02:00
Axel Uhl c75a33d874 consolidated imports
Change-Id: I745e4a3977fc3f8687e9aa6c8cfa69aa315cdc0c
2016-06-08 13:23:53 +02:00
Axel Uhl 75a4b37f53 Merge branch 'master' into ubilabs--rcapp--bug-3525 2016-06-08 13:03:49 +02:00
Peter Siegmund 7dc488753e NumberPicker for sec/msec in gray and smaller textSize 2016-06-08 12:50:59 +02:00
Axel Uhl a0bfbcaef7 removed obsolete statement System.currentTimeMillis() where the return value was not used
Change-Id: I5d084469c9ffd1362932fd928c15cced1ac21873
2016-06-08 11:52:37 +02:00
Axel Uhl e8332229a2 cleaned up i18n stuff in and around MediaPanel
Change-Id: I99fec8d06b369ce0085830a956138f74665582df
2016-06-08 11:34:24 +02:00
Axel Uhl 9be2bb2004 implemented single point of exit pattern in MediaPanel
Change-Id: I09a30edbcdf9544ecae91e722b8fc83127ec9f21
2016-06-08 11:24:51 +02:00
Axel Uhl 5b5b9f8ff0 consolidated imports
Change-Id: I52ef42a010c88137ce48758e0b0822b2e36c6201
2016-06-07 22:58:02 +02:00
Axel Uhl 9702cc8cb2 introduced new method TimePoint.getNearestModuloOneMinute, added test case for it and used in RaceManager app's StartTimeFragment
Change-Id: Ifd839f0d4d9f90b0306f428cfdd1bd0f9dc5bdf3
2016-06-07 22:57:23 +02:00
Axel Uhl 07e5063f26 Merge branch 'master' into ubilabs--rcapp--bug-3525 2016-06-07 21:25:19 +02:00
Axel Uhl 09b54e604d fixes regarding ConcurrentHashMap-->ConcurrentMap; use Iterable instead of Collection in MediaLibrary and related services
Change-Id: I71b2d1cef21cb9725001f1e84103644a8e076bc2
2016-06-07 18:23:32 +02:00
Peter Siegmund f74e75ce20 add "sync to minute" into "what's new" 2016-06-07 18:04:35 +02:00
Peter Siegmund adcf8cea3f hide "sync to minute" button in unscheduled state 2016-06-07 18:04:07 +02:00
Axel Uhl 4b11a46ca5 another ConcurrentHashMap-->ConcurrentMap declaration change
Change-Id: Idb691d65d9cc73b6483be2a19bfe95573a9d16a3
2016-06-07 17:15:36 +02:00
Axel Uhl 80b2da6baa another ConcurrentHashMap-->ConcurrentMap declaration change
Change-Id: I5d7722a0e38afad3d36318e57eaf52c6f066b8b8
2016-06-07 17:14:23 +02:00
Axel Uhl 32daae4ad3 where concurrency support plays a role, changed field declarations from ConcurrentHashMap to ConcurrentMap which is sufficiently specific
Change-Id: I71254d96d495a1a8d79e009d70fd8928b720b31e
2016-06-07 17:08:07 +02:00
Peter Siegmund 60e74174ab Code cleanup 2016-06-07 16:58:51 +02:00
Peter Siegmund 201c598425 sync to full minute 2016-06-07 15:55:21 +02:00
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 36ee1ffc39 whitespace/formatting change only
Change-Id: Idbd80127e812fb3958cf3adaf1a8908d2dd081f2
2016-06-07 09:33:13 +02:00
Peter Siegmund eb07329293 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3525 2016-06-07 09:07:10 +02:00
Axel Uhl 8c25a5a5c3 support default sailing locales also in AutoPlay entry point
Change-Id: I6a5771ee5e03279a864ddcbd6cfa94de06144966
2016-06-06 14:23:04 +02:00
Axel Uhl 7d6370428e adjusted usaged of PerspectiveLifecycle to the type arguments that were eliminated
Change-Id: Ia2f5a4e07af91873606f471ae04947b113bd68f1
2016-06-06 13:57:03 +02:00
Axel Uhl c499d53b49 removed redundant type argument from PerspectiveLifecycle, too
Change-Id: I2873b47ababc4ba2d40e0a72ce5537b5a58953c4
2016-06-06 13:55:47 +02:00
Axel Uhl 37547d8ac3 eliminated type arguments for PerspectiveCompositeTabbedSettingsDialogComponent and PerspectiveCompositeSettings
Change-Id: I3295922352aaff42d4af21cec8139d31d40faf35
2016-06-06 13:54:18 +02:00
Axel Uhl c077ae396a eliminated ComponentIdAndSettings
Change-Id: Ifabc4ce48fea0d631342ac56322f7593d3c47381
2016-06-06 10:39:23 +02:00
Axel Uhl d6537007ee a few whitespace and coding convention changes
Change-Id: I29bdabb56323a05cc5c2eabc55174cc774b11c9e
2016-06-06 09:44:50 +02:00
Axel Uhl b37f28ef33 eliminated PerspectiveIdAndSettings
Change-Id: Ia3eaa0980b0bf870ca78e0173af17c96ea97e3e8
2016-06-03 18:10:03 +02:00
Axel Uhl f353521428 removing PerspectiveIdAndSettings.perspectiveId (one of the existential reasons of PerspectiveIdAndSettings...)
Change-Id: Ib236c053c4102c779fc1a70d55641b00afe5886a
2016-06-03 18:00:05 +02:00
Axel Uhl 8a484366bd removed PerspectiveLifecycleAndSettings as it was not used anywhere
Change-Id: I2d65080003bf743b2721712d6899d42593258491
2016-06-03 17:47:03 +02:00
Axel Uhl f8ec511cf2 Merge branch 'master' into bug2610_componentid 2016-06-03 17:44:46 +02:00
Axel Uhl 5d9a1489ad Merge remote-tracking branch 'server/master' 2016-06-03 17:44:33 +02:00
Steffen Tobias Wagner d994e30f23 changed passwd command in ussailling mailsetup 2016-06-03 14:54:05 +00:00
Steffen Tobias Wagner 32cfb5ce94 added section about ussailing mail relaying 2016-06-03 14:46:05 +00:00
Axel Uhl 6e04e49db0 Merge branch 'master' into bug2610_componentid 2016-06-03 15:52:02 +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
fmittag cf3c335fd3 merged two classes for creating a dialog component for composite perspective settings into one 2016-06-03 13:01:31 +02:00
fmittag 532c9766a3 Fixed getSettingsDialogComponent() in AbstractPerspectiveLifeycycle 2016-06-03 12:44:19 +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
fmittag 587b31adce further major simplification of settings dialogs for perspectives 2016-06-02 19:54:43 +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