Commit Graph
14069 Commits
Author SHA1 Message Date
Axel Uhl 7bdc6e61d1 Merge branch 'master' into translation 2016-09-29 17:18:19 +02:00
service.tip.git d4567be6b9 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-09-29 12:17:32 +00:00
Axel Uhl c01daef9b9 Merge branch 'bug3928' 2016-09-28 17:59:54 +02:00
Axel Uhl 4c39ed417a fixed logging the right Future object
Change-Id: I3f599dc68e7171aa065b6393369087f480ff37a5
2016-09-28 09:42:26 +02:00
Axel Uhl ca14fe33f6 tracing for Future.get
Change-Id: I5c0bf627c86eef180889fa769e7952de2a27afdd
2016-09-27 17:17:33 +02:00
Steffen Schaefer 804e4bb3dc Merge branch 'bug3870' 2016-09-27 16:06:30 +02:00
Vladislav Chumak c7d05db4e0 bug3870 Refactored recent changes 2016-09-26 18:52:16 +02:00
Axel Uhl ebba32d6e9 factored the simulator admin console settings into a separate panel for re-use in the smartphone tracking tab
Change-Id: I5a15d9fca4b91f3c519cd05bad39106a98aca6f6
2016-09-26 18:14:18 +02:00
Steffen Schaefer de5e5a34a3 Merge remote-tracking branch 'origin/master' into foiling
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
2016-09-26 15:37:20 +02:00
Axel Uhl 45f00ceeb2 bug 3886: catch exception when a wind tracker cannot start, log it, and continue with next
Change-Id: I86b961ea917c2b1548423ca9a235dd2be866c2c8
2016-09-26 10:27:11 +02:00
Axel Uhl 0ab68739ae Merge remote-tracking branch 'origin/translation' into translation 2016-09-26 10:06:33 +02:00
Axel Uhl c90e3ea059 Merge branch 'master' into translation 2016-09-26 10:02:10 +02:00
Steffen Schaefer 7c7fdf1064 Merge branch 'master' into foiling 2016-09-26 08:22:54 +02:00
service.tip.git ab56ddc6f1 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-09-23 13:16:48 +00:00
service.tip.git 76785dd1fc Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-09-22 14:28:01 +00:00
Axel Uhl eba49aa39f fixing bug 3899 by only refreshing the marks table
Change-Id: I9104758c5ee5faec62c34bf208803331ddbaf614
2016-09-20 17:46:01 +02:00
Axel Uhl 41be703e1a adjusted Race Management app release notes
Change-Id: Ibf6ddb09e4552972e076ef1ddc74550030fbb939
2016-09-20 17:25:07 +02:00
Axel Uhl 14d1a9f20d Merge branch 'master' into bug3905 2016-09-20 17:20:57 +02:00
Steffen Schaefer 00d7dda7da Merge branch 'master' into foiling 2016-09-20 10:38:04 +02:00
Axel Uhl 526bcb9872 Merge remote-tracking branch 'server/master' 2016-09-20 10:35:12 +02:00
Steffen Schaefer 4940adf2b8 Merge branch 'bug3896' into master
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/SeriesActivity.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/events/EventsActivity.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/placeholder/Placeholder.ui.xml
2016-09-20 09:58:00 +02:00
Steffen Schaefer ca79eeb8a7 Merge branch 'bug3895' into master
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs
2016-09-20 09:22:03 +02:00
Steffen Schaefer 5b2ef3d728 Removed encoding settings for TextMessages files that were deleted some
time ago
2016-09-20 08:33:49 +02:00
Steffen Schaefer 934f0e8c2c Merge branch 'master' into foiling 2016-09-20 08:12:37 +02:00
Axel Uhl b9087d76ba Merge branch 'bug3864' 2016-09-20 01:26:44 +02:00
Axel Uhl b0487f94b7 fixing issues caused by using getItemText on drop-down boxes instead of getValue() when it is necessary to obtain the exact string
Change-Id: I9cbefb3c8945cef4e553214ab91029d5aaba6856
2016-09-19 22:51:26 +02:00
Vladislav Chumak eb16042819 Merge branch master into bug3895 2016-09-19 18:34:34 +02:00
Vladislav Chumak e1e87c369d bug3895 Removed planned events from mobile Quickfinder 2016-09-19 18:02:05 +02:00
Axel Uhl 4c8a0ce269 Merge branch 'bug3902' 2016-09-19 17:04:27 +02:00
Vladislav Chumak c3cf9805cb bug3895 Moved condition handling to
EventRegattaActivity.forPlaceSelection
2016-09-19 16:56:11 +02:00
Axel Uhl d2f88fee0a added missing null-check for leaderboard settings dialog (refresh interval); using a constant in LeaderboardEntryPoint to standardize the default refresh interval
Change-Id: Ie5df27ebe6ae308c29d4fee1a0426c7fe9c7b41c
2016-09-19 16:05:28 +02:00
Axel Uhl b76c9967f5 keep selection across filtering in device mapping dialog; improved corresponding Javadoc
Change-Id: I9dc8f9c71da070b9b6aa920a4c91a07fa9136704
2016-09-19 14:20:39 +02:00
Axel Uhl 5ba1597dfc made device mapping dialog's table text-filterable in addition to the PING type checkbox filter
Change-Id: I6cbfcfc8e932b86d53439b1357416dfde73297da
2016-09-19 14:10:21 +02:00
Peter Siegmund 983bdc93d6 updated release notes 2016-09-19 11:55:09 +02:00
Axel Uhl 303c83f7be removed warnings
Change-Id: Ieeac0accc571e6d2222a7d59ba1e1b9f5cdab824
2016-09-18 18:56:42 +02:00
Axel Uhl c13f632722 fixed compilation errors
Change-Id: I4a12b6c6281e9c46d1dd2d7624e177ce6694f06c
2016-09-18 18:54:50 +02:00
Axel Uhl 814f550756 Merge branch 'master' into bug3864 2016-09-18 11:01:22 +02:00
Axel Uhl 23ed858224 use foreground thread pool in SailingServiceImpl for maneuver calculation and getCompetitorRaceData
Change-Id: I0ed0bba0a1cd5027da9f9c78f0370f889df0076a
2016-09-18 10:49:39 +02:00
Axel Uhl 22854d9881 refresh TrackedRacesManagementPanel when it becomes visible
Change-Id: I5eb039ff927e87d5384540eff0b658dd5412e944
2016-09-17 18:01:23 +02:00
Steffen Schaefer 8d6e9ed1af Merge branch 'bug3871' 2016-09-16 13:59:57 +02:00
Steffen Schaefer f6cb58fc87 Fixes for the German translations 2016-09-16 13:57:28 +02:00
Alexander Tatarinovich 722c5fac3c Bug3871: Remove unused keys
Change-Id: I30ec1c591deae60befd6b47b7b708290410fe0d0
2016-09-16 13:18:23 +03:00
Steffen Schaefer 2973502dd3 Merge branch 'master' into foiling 2016-09-16 10:36:07 +02:00
Vladislav Chumak 307bb15d26 bug3895 Removed planned events from EventHeader dropdown 2016-09-15 18:24:06 +02:00
Alexander Tatarinovich 92f3ba6939 Bug 3871: change key
Change-Id: Id3fe867a9a9fe31307709d6e05a4d50898131196
2016-09-15 18:19:02 +03:00
Alexander Tatarinovich 00b8275c2b Bug 3871 - Get rid of legacy TextMessages
Change-Id: I04efbbe4ecb069068ef67aed45659fdb7072ff1a
2016-09-15 15:26:23 +03:00
Vladislav Chumak b8c5f91af4 bug3896 Added missing loading placeholder 2016-09-15 13:13:17 +02:00
Axel Uhl e7e4f0094f Merge branch 'master' into ubilabs--ios--develop 2016-09-15 11:24:36 +02:00
Steffen Schaefer 328538ec99 Merge branch 'master' into foiling 2016-09-15 08:25:00 +02:00
Vladislav Chumak 2dfb4db290 Merge branch 'bug3271' 2016-09-14 15:39:15 +02:00