Commit Graph
1199 Commits
Author SHA1 Message Date
Steffen Tobias Wagner (D059727) 5e4951a696 added sunbeam 22 boatclass to BoatClassMasterdata to fix bug3692 2016-06-09 15:57:51 +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 81620b3850 added "Platu25" as an alias name for "Platu 25"
Change-Id: I4c8a7cb794b9ba93525bf018891f00fb0724e4a7
2016-05-28 23:47:09 +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 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
Steffen Tobias Wagner (D059727) 9d83bc51de Added M32 catamaran boat class masterdata 2016-05-12 18:19:02 +02:00
Axel Uhl fbd79b6dde failing test case for bug 3648; introduced Speed.travel(Duration)
Change-Id: Ib164a12b0330f8c99251031553866435e82632fe
2016-05-11 15:15:05 +02:00
Peter Siegmund cb4ae30b59 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3624 2016-05-03 09:20:04 +02:00
Axel Uhl ecb7a6beba Merge branch 'bug3641' into translation 2016-05-03 00:46:20 +02:00
Axel Uhl 9d43227986 part three of bug3641: renamed realTotal to total; should be done now; let's wait for the tests
Change-Id: Ie91dbcd94fb52cba0a928389b3d531bf44750000
2016-05-02 16:33:58 +02:00
Axel Uhl a26b7f25cd renamed all totalPoints occurrences into netPoints
Change-Id: Iddf5e02a643b69e4f3f549b1757410cf61281185
2016-05-02 15:47:31 +02:00
Axel Uhl c5b494a0ba part one of swapping net/total point names: renamed all "net" to "realTotal"
Change-Id: Ia61d72e6c1c2323d2b9ad1e32c141b9a063e461d
2016-05-02 14:46:50 +02:00
Benjamin Barth 5af060bf7a Moved PathType to com.sap.sailing.domain.common to be able to i18n it 2016-05-02 14:36:51 +02:00
Axel Uhl 6526f20f00 declaring Offset and FixedBearing as "useless" passing instructions for now; they are not really supported internally
Change-Id: I12ba9000b775b9c518133a1f419d29cf8fdd46ec
2016-05-01 11:39:56 +02:00
Axel Uhl 2f364170bb bug3639: made the passing instruction entry work; considering removing Offset and FixedBearing for now (declaring them "useless")
Change-Id: Ia32911b5b01ad02b6ecebc396cb0d0b1ea6a1803
2016-05-01 11:37:08 +02:00
Axel Uhl bd0b929505 bug 3639: generalizing how PassingInstruction values are offered and processed
Change-Id: If894f4f5250e927788bc90a5f382c149c539fd91
2016-05-01 11:18:31 +02:00
Axel Uhl 7f5d8ae024 hot fix for bug 3639: PassingInstruction.Single_Unknown moved to end to keep strings.xml "consistent"
Change-Id: Ifce3080ef9d45d3804bf4af9d148885ab1cae3c8
2016-05-01 10:53:20 +02:00
Axel Uhl 726091f2df Merge remote-tracking branch 'server/translation' into translation 2016-04-27 17:49:45 +02:00
Axel Uhl 27d6cef9b4 added "FD" as alias for Flying Dutchman
Change-Id: Iafffb07a309c8622dca7bf1cbc822b1d99f55e56
2016-04-27 13:52:28 +02:00
Benjamin Barth a43e61d3e3 Use enum for master import sub progresses 2016-04-27 13:42:12 +02:00
Benjamin Barth 65d62298e8 Added enum for master import sub progresses 2016-04-27 13:41:55 +02:00
Benjamin Barth 097b200947 Moved i18n messages for master import sub progresses 2016-04-27 13:41:19 +02:00
Axel Uhl 8bc9b3222d cleaned up the escaping of URL parameters for assembling the links sent in e-mails for smartphone tracking sign-up
Change-Id: I4d101e0e7e116c4c08f04f52eda8e782242910ed
2016-04-27 10:46:01 +02:00
Benjamin Barth 330b25b99d Added missing i18n message for a master import sub progress 2016-04-27 10:41:02 +02:00
Benjamin Barth 05631b29b6 Used i18n messages for master import sub progresses 2016-04-27 10:33:38 +02:00
Peter Siegmund eb1a3a1b97 fixed removal of ADMIN_CONSOLE from valid values in CourseDesignerMode 2016-04-26 16:20:25 +02:00
Peter Siegmund 79920b3818 in CourseDesignerMode is ADMIN_CONSOLE not a valid value 2016-04-26 14:40:03 +02:00
Axel Uhl 450aaee1f1 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-22 22:41:12 +02:00
Axel Uhl 5f5a3c460e introduced CourseDesignerMode field on RaceLogCourseDesignChangedEvent and field isWaypointSequenceValid on CourseDesignerMode;
this is to solve bug 3608 because course designs coming from the ByName course editor will no longer be used to update
a TrackedRace's course.

Change-Id: I8a1aa432f931838902c546a2365b68a8ca59b72e
2016-04-22 16:47:39 +02:00
Axel Uhl 82e962bf66 Merge remote-tracking branch 'server/bug3532' into ubilabs--rcapp--bug_3011 2016-04-22 00:18:22 +02:00
fmittag ca9550e93d implemented new attribute fleetsCanRunInParallel on Series domain object including storage, test, replication and admin UI 2016-04-21 17:26:53 +02:00
Axel Uhl d416b90b50 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-20 18:03:01 +02:00
Axel Uhl 1e3a282461 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java

Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e
2016-04-18 17:48:32 +02:00
fmittag 3d17c7d3c2 added a 'courseExist' status field for smartphone tracked races 2016-04-15 11:49:56 -04:00
Axel Uhl 8b5cade99d Merge remote-tracking branch 'server/competitor_searchtag' 2016-04-15 14:29:02 +02:00
fmittag ef7d84bd81 added a searchTag attribute to 'Competitor' to make it possible to 'tag' competitors for an easier search later on 2016-04-14 13:44:37 -04:00
Axel Uhl 6c85d0462b use final for local variables where possible
Change-Id: Ieac283b754c17a00a4389a5339068a4415eb6b54
2016-04-14 12:58:32 +02:00
Peter Siegmund 99ecc950cb Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-1267 2016-04-14 10:17:33 +02:00
Axel Uhl 6e1865f0f7 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-14 10:11:35 +02:00
fmittag 463204e189 added TLE (Time limit Expired) as new MaxPointReason used at the CRW 2016 (see sailing instructions) 2016-04-13 15:07:50 -04:00
fmittag 8c3f7096c3 added white as possible fleet color for the CRW 2016-04-13 14:54:54 -04:00
Peter Siegmund 61089e2b83 load race column factors at login 2016-04-13 15:12:19 +02:00
Axel Uhl e33ad32ef9 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-11 11:08:18 +02:00
Axel Uhl eb5a3e9659 Merge remote-tracking branch 'origin/bug3583' 2016-04-08 23:28:07 +02:00
Axel Uhl 8b6e9edef5 introducing TimePointSpecificationFoundInLog to solve bug 3583: distinguish between explicit null time point in log and unspecified time point
Change-Id: I38fbdebf186cb2e5eda172ac5df790691422ec24
2016-04-08 12:58:33 +02:00
Axel Uhl 028c8ee298 added a slight penalty for finishing candidates that have a valid distance between 1 and 2 times the leg distance but have greater distance
Change-Id: I4908b5ba4a70cd828d144f51c42a7c0387201c08
2016-04-08 12:24:28 +02:00
Bennet Brunsen 4935c7d258 Prevent scheduled races and races in startphase from showing subsequent races 2016-04-05 17:43:45 +02:00
Bennet Brunsen fd787d7217 Merge master into ubilabs--rcapp--bug_3011 2016-04-05 12:52:02 +02:00
fmittag bef8795bbd added missing boat class masterdata for Charlston race week 2016 2016-04-01 18:35:26 +02:00