Commit Graph
35652 Commits
Author SHA1 Message Date
Alexander Ries b47ef6bfff Refined BoatMarkVectorGraphics scale subclassing for selection drawing 2016-10-20 15:53:57 +02:00
Alexander Ries 9dc23c149e Deleted method for drawing finish boat 2016-10-20 15:36:53 +02:00
Steffen Schaefer 779d1d8c10 Merge branch 'bug3950' into master 2016-10-20 15:11:18 +02:00
Alexander Ries 5b38b67e9d Merge remote-tracking branch 'origin/master' into startboat 2016-10-20 14:49:46 +02:00
fmittag 65de381ca9 Merge remote-tracking branch 'origin/bug3879' 2016-10-20 14:25:11 +02:00
fmittag 3f8e472115 Merge remote-tracking branch 'origin/master' into bug3879
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
2016-10-20 14:18:36 +02:00
Steffen Schaefer f6a3401501 Merge branch 'bug3866' into master 2016-10-20 11:31:53 +02:00
Axel Uhl dc04d0fe84 release notes entry for Race Management app
Change-Id: I05e790a67bd056339b97b298d4dedf3cdbf6aa55
2016-10-20 10:47:32 +02:00
Axel Uhl 7c2cc3135f Merge remote-tracking branch 'server/master' 2016-10-20 10:44:20 +02:00
Axel Uhl d0232fe71e fixed a few German translations in the race management app
Change-Id: I4d16f4aeeee2a0f7a9d77caedbb20e0e189eeb89
2016-10-20 10:41:52 +02:00
Axel Uhl 67a2e89088 added release notes entry for URL encoding of access token parameter for QR code for Race Management app 2016-10-19 20:49:34 +02:00
Axel Uhl 95d19183f2 URL-encode the access token when generating the URL displayed as a QR code for the device configurations in the admin console
Change-Id: I2b861a8d42e8b75c5f46e35645e61b6993e0512a
2016-10-19 18:49:30 +02:00
Axel Uhl a7ac457c84 Merge remote-tracking branch 'server/master' 2016-10-19 16:04:10 +02:00
Axel Uhl 00cbfca35f added logging
Change-Id: I4602f8c5f445d5c8e4098cf77955891572989ab3
2016-10-19 15:24:03 +02:00
Axel Uhl 2cad873645 Merge branch 'master' into bug3233 2016-10-19 15:20:40 +02:00
Alexander Tatarinovich 85e36c720f bug3868: fix padding and overiding hider
Change-Id: I41960781ba41ff478d220624f83f348e2c02f69f
2016-10-19 15:29:57 +03:00
fmittag ee334fcada Added message keys to other languages 2016-10-19 14:14:34 +02:00
fmittag bd15762f6b Reduced overall height of event dialog 2016-10-19 13:39:24 +02:00
fmittag e6c29f5a6e Improved layout and labels of 'sailors info url' fields 2016-10-19 13:37:51 +02:00
Stsiapan_Tsybulski 3c688ffc95 Merge branch 'master' into bug3816_2 2016-10-19 13:09:47 +03:00
Alexander Tatarinovich 69a4ef0abf bug3866: fix size toolbar buttons
Change-Id: I3faa6d2180acd018c2397e0c37abe513ed3a14d2
2016-10-19 11:29:49 +03:00
fmittag 1c01a2ce98 Merge remote-tracking branch 'origin/master' into bug3879
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
2016-10-18 18:22:15 +02:00
Kai Boernert f73b2f138a npe fix for bug3950, based on missing livecyclesetting objects 2016-10-18 17:37:17 +02:00
Alexander Ries 17110b515e Solved master merge conflicts 2016-10-18 16:53:11 +02:00
Lennart Hensler 9ada894373 Implemented KPI for the rank after the half of the first leg for races of competitors 2016-10-18 16:22:49 +02:00
Alexander Ries be7564ffb6 Added highlighting to marks of type STARTBOAT and FINISHBOAT 2016-10-18 16:16:31 +02:00
Benjamin Barth cb8f956244 Revert "bug3949 Reversed sort order of events in a series"
This reverts commit 59f5541346.
2016-10-18 16:01:53 +02:00
Benjamin Barth 59f5541346 bug3949 Reversed sort order of events in a series 2016-10-18 15:15:35 +02:00
Benjamin Barth cfa3149ddb Merge remote-tracking branch 'origin/bug3869' 2016-10-18 14:57:40 +02:00
Axel Uhl a20a8da156 added toString() implementation on RegattaName
Change-Id: I5e2bbced5424664183b1eb734c2761747d6b0033
2016-10-18 14:39:39 +02:00
Axel Uhl 68539c1acd Merge remote-tracking branch 'server/master' 2016-10-18 14:33:10 +02:00
Papick Garcia Taboada de56be177f Merge branch 'bug3938' 2016-10-18 14:06:18 +02:00
Steffen Schaefer 05fe7de168 Merge branch 'master' into bug3529 2016-10-18 14:04:22 +02:00
Axel Uhl 40413eb05b Merge branch 'master' into bug1552 2016-10-18 13:55:48 +02:00
Axel Uhl 08c9cdfbf8 turned Distance.NULL into named inner class NullDistance to make GWT serialization of Distance.NULL succeed
Change-Id: Ic2135efb0beb210a2abf49da7a87d19528d96720
2016-10-18 13:54:34 +02:00
Papick Garcia Taboada e60b987a2d Merge branch 'master' into bug3938 2016-10-18 13:31:02 +02:00
Axel Uhl 5b8709f946 Merge remote-tracking branch 'server/master' 2016-10-18 13:09:23 +02:00
Axel Uhl 763e6ece9d added release notes for bug 1564 (buoy zone radius in hull lengths on regatta)
Change-Id: I2dad6dc16e1be8e9d5fd15535c27bb2309bd06a9
2016-10-18 13:07:53 +02:00
Axel Uhl a212b415ef removed addition of buoyZoneRadiusInMeters parameter to RaceBoard URLs again
Change-Id: Ieea6f33e5a8eea1ac1950acba90003f71107e9cc
2016-10-18 12:58:27 +02:00
Papick Garcia Taboada c5a76c268e Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug3873 2016-10-18 12:54:40 +02:00
Axel Uhl 42b89391df use default map settings if no buoy zone radius provided in URL; only update settings if buoy zone radius changes by that
Change-Id: I3477cba714bc4f6217ff2d6868eb902bdfe490c7
2016-10-18 12:43:18 +02:00
Lennart Hensler d1eb22345c Implemented a dimension for tack at start and statistics for speed 10s after start and rank 10s after start for races of competitors 2016-10-18 11:58:15 +02:00
Axel Uhl 5a2fd026a2 Merge branch 'master' into bug1564 2016-10-18 11:38:53 +02:00
Axel Uhl 6510bc445d small grammar change in InSight release notes
Change-Id: I6ed37de7e49a4af7ac95b6f6d4d35ac3ec1d6386
2016-10-18 11:38:04 +02:00
Kai Boernert 34386899e7 Merge branch 'master' into bug3938 2016-10-18 11:20:24 +02:00
Lennart Hensler 20937128dd Implemented a dimension for the passing side of a mark passing 2016-10-18 11:14:22 +02:00
Kai Boernert 0547f1afab disabled standart buggy reflow of highcharts, fixed custom resize 2016-10-18 10:57:56 +02:00
Steffen Schaefer 837b547c50 Merge branch 'master' into bug3529 2016-10-18 10:50:36 +02:00
Alexander Tatarinovich b9a96f0d98 Bug 3233: When file upload takes too long, URL is not filled.
Change-Id: Id79405a33e3b79b8f4ed683ec79e279babe985b5
2016-10-18 11:39:14 +03:00
Papick Garcia Taboada 87894ceb66 Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug3873 2016-10-18 10:32:40 +02:00