Commit Graph
42811 Commits
Author SHA1 Message Date
Kai Börnert f33ed40e6f bug4371 added messages bundle and german/english translation 2018-04-16 15:28:16 +02:00
Kai Börnert 4d80223c64 Merge branch 'bug4371_2' of ssh://trac@sapsailing.com/home/trac/git into
bug4371_2

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java
2018-04-16 14:28:27 +02:00
Kai Börnert 9cdb26baca use i18n for allInOneImporterServlet 2018-04-16 14:20:36 +02:00
Steffen Schaefer 729ef3dd30 Bug 4371: Added placeholder to suggest fields 2018-04-16 13:02:31 +02:00
Steffen Schaefer b9c351234f Bug 4371: Added locale parameter for expedition all in one importer as
preperation for I18n of error messages
2018-04-16 11:41:57 +02:00
Steffen Schaefer acdc8be87f Merge branch 'master' into bug4371_2
# 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
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2018-04-16 11:04:41 +02:00
Kai Börnert 91e352880a Merge branch 'bug4425'
Conflicts:
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java
2018-04-16 09:17:59 +02:00
Vladislav Chumak 7f3115cfc9 Merge remote-tracking branch 'origin/maneuver_refactoring' 2018-04-15 14:31:18 +02:00
Axel Uhl 9bf2017868 Merge branch 'translation' 2018-04-14 19:57:51 +02:00
Axel Uhl 4880c3b34b added missing parameter to french translation 2018-04-14 16:56:59 +02:00
Axel Uhl 837004e765 Merge branch 'bug4509' 2018-04-14 10:38:46 +02:00
Axel Uhl dee8c9a451 Merge remote-tracking branch 'origin/bug4494' 2018-04-13 22:36:08 +02:00
Axel Uhl be75d3011e Merge remote-tracking branch 'server/master'
Change-Id: I70209733da7173907456c4fac7126618a9827a8b
2018-04-13 21:21:33 +02:00
Axel Uhl df3fc3ffe6 made boat JSON deserialization backward compatible by using competitor ID as default boat ID
Change-Id: I7b6c0431ebe4085d035bd9a64d9b1f4dadad192f
2018-04-13 21:11:55 +02:00
Vladislav Chumak 80c0338531 Applied safe integer deserialization strategy for CompleteManeuverCurves 2018-04-13 20:01:10 +02:00
Vladislav Chumak 8f86d0a862 Added deserialization for DetailedBoatClassJsonSerializer, fixed test 2018-04-13 19:02:34 +02:00
Vladislav Chumak f702fea3d0 Implemented serialization/deserialization test for estimation data 2018-04-13 18:08:09 +02:00
Axel Uhl 0d5e4261eb try loading competitors from XrrEntriesUrl only if that URL is not null
Change-Id: Ie8250d815e7fac8043a4019f70922e2a5bf111fe
2018-04-13 17:35:04 +02:00
Axel Uhl cd0784b618 when storing the SwissTiming configuration, accept null port value
Change-Id: Iff8c35db5b7bbd7fcdfb4e2b04d4b40d98a7cb18
2018-04-13 17:04:27 +02:00
Vladislav Chumak c585833459 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-04-13 16:35:41 +02:00
Axel Uhl 3969c46c57 post-merge cleanup for getCompetitorAndBoatStore rename
Change-Id: Iad59673054de81946b75ba1069562ac3c1cab52e
2018-04-13 15:57:57 +02:00
Axel Uhl 22b4ec6535 Merge branch 'master' into bug4509
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
2018-04-13 15:55:28 +02:00
Axel Uhl db1bdcb847 in HttpUrlConnectionHelper return URLConnection to also allow using it for non-HTTP URLs such as bundle resource URLs
Change-Id: Icaeabcc4bee8aae5fa532be77ab9f357fd3f13a9
2018-04-13 15:52:40 +02:00
Axel Uhl 1ab19d4a47 Created privacy (markdown) 2018-04-13 10:21:50 +00:00
Generic Wiki User 9e6c401747 Merge branch 'master' of /home/trac/git 2018-04-13 10:20:02 +00:00
Axel Uhl c88ad4af4d added a script to scan all DBs for a user's e-mail address (privacy request); scans USERS and COMPETITORS
Change-Id: I2bf4d7666e625cfa6903d87de8bd0e7159caca92
2018-04-13 12:19:12 +02:00
Axel Uhl 19c3722c55 Updated home (markdown) 2018-04-13 10:17:48 +00:00
Steffen Schaefer c2d0f1bc92 Merge branch 'master' into bug4425 2018-04-13 11:29:45 +02:00
Steffen Schaefer a6e972fa90 Bug 4425: Fixed determination of heel and pitch for Leaderboard with
simple BravoFixes
2018-04-13 11:28:05 +02:00
Steffen Schaefer 3d102819d7 Bug 4425: Fixed determination of rideHeight, heel and pitch for
BravoFixTrack
2018-04-13 11:17:32 +02:00
Axel Uhl 77a1e37d3d Merge remote-tracking branch 'origin/translation' into translation
Change-Id: I8d8c7762f70d8877791f7c39e4d0005ffb472633
2018-04-13 10:05:25 +02:00
Axel Uhl b2a1e1c9c9 Merge branch 'master' into translation
Change-Id: Ic8864ad43f1d98d2c7de2c29e2187a746184e3e9
2018-04-13 10:03:35 +02:00
Steffen Schaefer 3ef48460df Bug 4371: Removed unnecessary comment 2018-04-13 09:58:02 +02:00
Steffen Schaefer 2acd4d045b Bug 4371: Refactored parts to new methods in ExpeditionAllInOneImporter 2018-04-13 09:56:40 +02:00
Axel Uhl dc022ca37d bug4511: reverting back to the use of UUID.randomUUID now that the CompetitorWithBoat's boat is returned for existing competitors
Change-Id: I66ba31edd7473940bab5589fbcac86ac5abe4c91
2018-04-13 09:47:05 +02:00
Axel Uhl 514d132314 bug4511: now returns the SwissTiming competitor's boat instead of an unused one
Change-Id: Ib17131bed6f1813d303854391396fe528e6f18f5
2018-04-13 09:36:33 +02:00
Axel Uhl b4f1c8fb10 more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Steffen Schaefer b4bf6ac134 Bug 4371: Refactored parts to new methods in ExpeditionAllInOneImporter 2018-04-13 08:53:31 +02:00
Steffen Schaefer 7b3d916540 Bug 4371: Improved method name 2018-04-13 08:43:11 +02:00
Steffen Schaefer c04803a52a Bug 4371: Resolved TODO and updated flags when tracking races during
import to be consistent on server and client
2018-04-13 08:41:50 +02:00
Axel Uhl 9b2e0c7415 construct a stable boat ID for SwissTiming competitor creation
Change-Id: I3641ac3a45cff2cf601769d574c89b2dbf146031
2018-04-13 08:41:11 +02:00
Axel Uhl a27a5b2b9c Merge remote branch 'origin/master' into bug4494 2018-04-13 06:49:27 +02:00
Vladislav Chumak 56b5551864 estimation data - extended json api, added deserializers, refactored 2018-04-13 02:21:04 +02:00
Vladislav Chumak 5758fd17b7 Introduced DetailedBoatClassJsonSerializer for wind estimation data 2018-04-12 23:10:48 +02:00
Axel Uhl be4f1d3197 don't track an Expedition log file's race with wind tracker
Change-Id: I98137ea3f6508ad4a8cdb620bfc7e3a05be817f7
2018-04-12 20:55:32 +02:00
Axel Uhl ccefc05d63 Merge remote-tracking branch 'server/bug4425' into bug4425
Change-Id: I8ec486a20169f1beeeec4362dd22580eb0735fb8
2018-04-12 20:09:32 +02:00
Axel Uhl f4a8ed1106 Merge branch 'master' into bug4425
Change-Id: I431c2aefe52d83c7f63a0962d265a45cf23ef9bb
2018-04-12 20:08:37 +02:00
Axel Uhl 9d0072ba0d Merge branch 'master' into bug4509
Change-Id: I79b7f16bb802ec6003f317e5e1cb89631402cd3d
2018-04-12 19:40:15 +02:00
Axel Uhl ddb75a3a66 Merge branch 'master' into bug4371_2
Change-Id: I4820cb36dc92a4e1269abfaecf23289b96f17f42
2018-04-12 19:39:43 +02:00
Axel Uhl 8134b69bf1 updated IncrementalLeaderboardDTO.ser for tests after incompatible class change
Change-Id: I1989c5525a8c3ba76d17b9947c903c454ea4f207
2018-04-12 19:36:00 +02:00