Commit Graph
1145 Commits
Author SHA1 Message Date
Axel Uhl 329d46769c Merge branch 'master' into bug2840
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java

Change-Id: I9cca175d1e3dd3876235c15ccef388f4a9ef0e98
2016-03-22 14:54:47 +01:00
Axel Uhl 5dd983012c introduced a first metric for start waypoint candidate assessment based on other competitors' distance to start waypoint
Change-Id: Idedffd89173d535aab65e706e217ec3446cf0c25
2016-03-16 13:44:44 +01:00
Axel Uhl 12f9177e50 started to implement a start mark passing candidate evaluation based on the other competitors' distance to the start line at that time point
Change-Id: Ie7eba729648041c26cce9378a3b5fc3a11f8d2dd
2016-03-14 18:30:30 +01:00
Axel Uhl dc08833b46 don't apply penalty for wrong side if side is undefined; introduced PassingInstruction.Single_Unknown for this purpose
Change-Id: I0502b41df0ce409621c7da9c7d8dca0036e56cdd
2016-03-14 16:39:24 +01:00
Axel Uhl 9dda3d7b81 introducing a dedicated permission for MANAGE_MARK_POSITIONS
Change-Id: I43a416687e987e012d5238e270782eb9375e1789
2016-03-04 16:54:10 +01:00
Axel Uhl 3ca9d08bf3 Merge branch 'master' into bug2840
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties

Change-Id: I6d1682e2edb0f30c986aa1b6382dad6da094665a
2016-03-04 09:59:12 +01:00
Axel Uhl d8186a9985 Merge branch 'design2015' into bug2589
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I9daa6eff11d272940f087d3704a6f34ae527bb5e
2016-03-02 18:52:22 +01:00
Axel Uhl e618ac0cff use & to separate fragment parameters
Change-Id: Idaeac854591c00c8df624d116b14393512ef0858
2016-03-02 15:00:57 +01:00
Axel Uhl 2b392c81fd fixing check for device identifier; it doesn't have to be the first fragment parameter
Change-Id: Id4ad166d2359e551b94cc69bf08ba6cbc0aefa28
2016-03-02 14:59:32 +01:00
Axel Uhl 5f6c3775e8 whitespace change only
Change-Id: I90c2f7f4d32afe1fb762f6a5f54618d9474affc3
2016-03-02 14:56:59 +01:00
Axel Uhl a0a8c7f4d1 Merge remote-tracking branch 'server/bug3493' into bug3493
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java

Change-Id: Iea8dc1ba061467840ea3ae0662438cd609b68a56
2016-03-02 14:56:39 +01:00
Axel Uhl 6aec12d192 fixing how the token is parsed, limiting "=" split to two elements, accepting token to contain "="
Change-Id: I6b5c5210e9eca4639d175a5f13efad5a9f4e6ed0
2016-03-02 14:53:56 +01:00
Axel Uhl 2f487f6dc2 shows the token as additional parameter in the device configuration QR code in AdminConsole
Change-Id: I6c25a776c6eb5344a18ac5948b5cff5a35986b9a
2016-03-02 14:47:05 +01:00
Peter Siegmund 461d8a75cd save access_token from qrcode into preferences 2016-03-02 14:41:41 +01:00
Axel Uhl be0a483a7e don't use URLDecoder from java.net package; it's not in the GWT JRE emulation
Change-Id: I9877c3d0a71874aad7568d559f2c4a59556246d2
2016-03-02 14:32:02 +01:00
Axel Uhl 13b37b204d fixed HashMap import
Change-Id: Ibf448c5b575a47844eb674d82e4f92c73d1a22ba
2016-03-02 14:28:01 +01:00
Axel Uhl 1bc8300210 added access token to QR code
Change-Id: I9fb1f44c8e21da4a30df9ce78dd75519c49a5476
2016-03-02 12:49:51 +01:00
Axel Uhl 8ed91f4096 fixed post-merge issues with missing , or extra ; characters in merged lists of permissions
Change-Id: I0635a8e4a09d73f5807c90f182030a485be9928d
2016-03-01 16:54:34 +01:00
Axel Uhl c356c2f97c Merge branch 'master' into bug2589
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java

Change-Id: I3aaf2651c01460dd2fb0caf95735b9919586a2c9
2016-03-01 16:47:00 +01:00
Axel Uhl f78c73f639 Merge branch 'master' into bug2840 2016-02-22 16:27:29 +01:00
Steffen Schaefer 014b9f2531 Merge branch 'design2015' into design2015-user-management
# 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
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
2016-02-22 11:56:15 +01:00
Steffen Schäfer 0369d90305 Added permission MANAGE_LEADERBOARD_RESULTS for LeaderboardEditing to
not need checks for role eventmanager anymore
2016-02-11 11:16:43 +01:00
Jonas Dann 5930764219 Merge branch 'master' into bug2840 2016-02-05 16:15:59 +01:00
Peter Siegmund c52e5a3219 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3077 2016-02-04 15:54:56 +01:00
Benjamin Barth 08f6a0ae85 Roles.moderator now grants Permission.CAN_REPLAY_DURING_LIVE_RACES 2016-02-03 15:00:14 +01:00
Peter Siegmund 9c7ebb399b simple onboarding after fresh install 2016-02-03 14:42:32 +01:00
Benjamin Barth 1b7d5e7698 Added new Permission.CAN_REPLAY_DURING_LIVE_RACES 2016-02-03 13:25:14 +01:00
Benjamin Barth 57e43ce7b4 Roles.eventmanager now grants Permission.MANAGE_MARK_PASSINGS 2016-02-03 12:56:16 +01:00
Benjamin Barth 7553cdb044 Added new permission for edit mark passings 2016-02-03 12:51:46 +01:00
Steffen Schäfer 24366e7274 Roles.eventmanager and Roles.mediaeditor now grant
Permission.MANAGE_MEDIA
2016-02-03 12:46:29 +01:00
Jonas Dann ef8ba3c326 Added new svg for mark fixes and some code to show all the mark fixes on the screen 2016-02-01 17:17:49 +01:00
Axel Uhl 209066b87b fix for bug 3446: entity identity comparator for device configurations now compares the list of device names
Change-Id: I72f7d20cdb95d64cc403e7645f46c86a3f8c8384
2016-01-30 12:33:27 +01:00
Axel Uhl c0f30fd545 removed "MULTI" device configuration stuff which was unused
Change-Id: Ie27a13acdf84c6978f26ecef362df58f3514e967
2016-01-30 12:14:21 +01:00
Jan Broß 249b01e3df Merged master into bug2851 2016-01-22 14:18:58 +01:00
Axel Uhl a23387bacd fixed ordering in BoatClassMasterdata
Change-Id: I8fc0fe40ca99e89137d6d2a3754ec14595bba298
2016-01-18 18:25:45 +01:00
Axel Uhl b488c2608f Merge branch 'master' into gc32-changes 2016-01-18 17:14:00 +01:00
Axel Uhl babd76d4a3 formatting changes only
Change-Id: Ie9442d4229d8f773d40f6f632aa8a94a527b0188
2016-01-18 09:27:16 +01:00
Axel Uhl c5f9d0b2a0 validate race competitor registration dialog: it's invalid (not saveable) if the race does not support per-race competitor registrations
Change-Id: I683234365c642c40a1ae70cd98b7d491c11af753
2016-01-15 18:04:15 +01:00
Axel Uhl a1b9492971 deprecated RACE_LOG_MARK, as it was replaced by REGATTA_LOG_MARK
Change-Id: Ia10f4c2b417f67dc375ef3435404270c34ea6187
2016-01-14 14:14:20 +01:00
Axel Uhl 7216a8cee5 Merge branch 'master' into bug2851 2016-01-13 09:52:31 +01:00
Axel Uhl e6fef6c04f Merge branch 'master' into bug2851
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java

Change-Id: Ifd8c60c6f7d2d2274a68681607a1b5df7b4040b7
2016-01-13 09:39:02 +01:00
Axel Uhl 432c979135 Merge branch 'master' into bug2589
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java

Change-Id: I63f05a28bdf63a0c6b7731e03c36b28b61e4638e
2016-01-12 14:28:13 +01:00
Axel Uhl 3917060c1a Merge branch 'master' into android-maven-build-bug3190
Conflicts:
	java/pom.xml

Change-Id: I8707442d05979fcd8e0a8be0b593ee3e94a513d3
2016-01-12 12:47:30 +01:00
Simon Pamies c1f870082e Added new high point scoring schemes for GC32 scoring based on NOR 1.5 from October 2015 2016-01-11 14:04:22 +01:00
Simon Pamies 336143dd6e Added first information for GC32s 2016-01-08 12:05:09 +01:00
Axel Uhl bfd33b20cd use parseStrict instead of parseLenient in URLFieldWithFileUpload; fixed <pre> wrapping by setting content type to text/html instead of application/json
Change-Id: I37852c582333b787e3a9ff8dfeef59e5703c1442
2016-01-08 11:23:32 +01:00
Axel Uhl 6169f54e25 Merge branch 'master' into bug2589
Conflicts:
	java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/RestServletContainer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java

Change-Id: I8cbb797ba64d221ea401b90b22d21a813204a6f2
2016-01-04 11:34:01 +01:00
Axel Uhl 96d51518ba performance improvement for QuadTree Node.get(Bounds)
Change-Id: I51711145b9b3beba1031fc9c7665e2af0c351eab
2015-12-24 14:52:54 +01:00
Axel Uhl 80bf2e6220 using a multi-pass approach with small arrays turns out to be much faster than java.util sort mechanisms with Comparators
Change-Id: I38083366b449903fef57fff42ef3c270cddb2942
2015-12-24 12:58:40 +01:00
Axel Uhl 759dc0ada9 fixed subnode traversal check; left code for pre-sorting children commented in Node; to decide soon what works better; still some warnings
Change-Id: Ief71343a4dd1387ceea27fdbafbeae144085942f
2015-12-24 12:21:57 +01:00