Commit Graph
1393 Commits
Author SHA1 Message Date
Axel Uhl 242513b42e Merge branch 'master' into permission-vertical 2019-04-13 08:25:19 +02:00
Robert Benedikt 28d111b1d8 Print competitor short name and enable sorting 2019-04-12 17:20:26 +02:00
Robert Benedikt ebc4c1ead6 Add workaround to reset rank if competitor is removed from finish list 2019-04-12 16:11:05 +02:00
Axel Uhl 667edb0a0b Merge branch 'master' into permission-vertical
Change-Id: I7efa8b65c89f44cbc672da0ba43afcc183b08d73
2019-04-12 11:52:58 +02:00
Robert Benedikt e7a97749bc Merge branch 'master' into bug4703
# Conflicts:
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultWithIdImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/PenaltyFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
2019-04-12 11:34:24 +02:00
Axel Uhl 4899fcc1be prefer boat name over sail ID in boat column
Change-Id: I7de5a59b1ddd4feb92b08cdb9a32bee328c73ce2
2019-04-12 10:54:39 +02:00
Axel Uhl 02fcbf7c6b Revert "Print competitor short name and enable sorting";
This reverts commit 7d7f6a742e.
The changes were targeted at improving the competitor display in
the app but failed to consider the non-mobile projects. Furthermore,
significant comments, such as those of Competitor.getShortInfo() were
simply removed, and the method was replaced by getDisplayName without
a comment which is less than optimal.
2019-04-11 22:39:15 +02:00
Robert Benedikt 7d7f6a742e Print competitor short name and enable sorting 2019-04-11 17:12:08 +02:00
Steffen Schaefer 70a9de04b5 Replaced several functional interfaces in com.sap.sse.common.Util with
their Java 8 counterpart
2019-04-11 12:57:36 +02:00
Axel Uhl 448a8bcb51 Merge branch 'master' into permission-vertical 2019-04-06 01:15:10 +02:00
Axel Uhl 2b098c7f83 switched remaining projects from JavaSE-1.7 to JavaSE-1.8
Change-Id: Ib053b405b79edaaf5183e155690f02b08f7eef95
2019-04-05 22:40:16 +02:00
Axel Uhl 0fcfe1ee3f made DeviceConfiguration extend WithQualifiedObjectIdentifier
Change-Id: If30522c4a15f607e930955835522c81162ade050
2019-03-01 17:05:03 +01:00
Axel Uhl 850a904d63 refactored DeviceConfiguration stuff, removing matcher design, introducing UUIDs
Change-Id: Iec8555a3f1a3cb5a52ed272e4560226e4de654d7
2019-03-01 13:24:42 +01:00
Axel Uhl 928fb696f9 Merge branch 'master' into permission-vertical
Change-Id: I34f527380632a307472bdca1d120708b31ca856b
2019-02-15 18:15:13 +01:00
Axel Uhl d38a18ba88 Merge branch 'master' into permission-vertical
Change-Id: I1e8765d54858c3598e6403490233a07d5780f405
2019-02-15 09:43:43 +01:00
Axel Uhl a9cbb9acc1 Merge branch 'master' into bug4221
Change-Id: Icab41b18b5f8c13b9020e129db25f4297f10077e
2019-02-14 18:37:20 +01:00
Axel Uhl a8a3a3d392 letting TrackListeners distinguish add/replace in the callback
Change-Id: I68261e029aa9bed79f7cafe231b2b9949ecda1e1
2019-02-13 12:09:03 +01:00
Robert Benedikt 3fb10d5ad5 Revert redundant type inference for Tycho compiler 2019-02-11 15:19:52 +01:00
Robert Benedikt 928d74752f Consider configured start mode flags 2019-02-11 13:16:30 +01:00
Kai Börnert 250783b4ae Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.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
2019-02-11 09:25:45 +01:00
Axel Uhl c3cac7df98 Merge remote branch 'origin/master' into bug4469 2019-02-09 17:33:47 +00:00
Axel Uhl 6f1c258ac6 figgled a bit with maneuver angle thresholds and a few tests; still some are failing 2019-02-05 23:21:24 +01:00
Axel Uhl 654b7c4fa2 added Javadoc
Change-Id: I4fcd87e412439369fa6900a50b50d2ef2e26ca75
2019-02-05 00:08:25 +01:00
Steffen Schaefer a38377c270 Added a dependency in the gradle build from
com.sap.sailing.domain.shared.android to com.sap.sse.security.common. An
equivalent dependency seems to be introduced for the OSGi/Tycho build
with permission-vertical.
2019-01-28 11:57:49 +01:00
Steffen Schaefer 73b377a6cd Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2019-01-24 09:41:58 +01:00
Axel Uhl ae2b04eac1 Merge branch 'master' into bug4469
Change-Id: Id1fc5990367bb9a5f7a197befdacab305f67a6c7
2019-01-22 21:02:35 +01:00
Axel Uhl 2ede9c12c2 reverted mail generation-related changes on bug4412; see also bug4720_mail
Change-Id: I3fb3eeeb9881c1888c2cfa18744a808ff712e6b0
2019-01-07 14:49:22 +01:00
Robin Kuck ab27f9f155 Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2019-01-05 14:30:00 +01:00
Steffen Schaefer 78e6afba72 Code cleanup 2018-12-19 12:35:52 +01:00
Steffen Schaefer c315d811e7 Removed method parameter by introducing specific handling for
ExpeditionDeviceConfiguration that has the server name included in the
type relative object identifier
2018-12-19 09:52:34 +01:00
Thomas Wiese 30fd1965a3 bug 4813: fixed some gwt problems 2018-12-17 18:51:41 +01:00
Thomas Wiese a387055f95 bug 4813: building the identifier for permissions checks is now be done
by supporting a TypeRelativeObjectIdentifer object that has to be built
by domain objects
2018-12-17 15:49:44 +01:00
Thomas Wiese 09e0f12fbc bug 4813: use concrete object instead of typerelative identifier to
build QualifiedObjectIdentifiers by delegation to the identiferstrategy
of the permissions type
2018-12-07 14:09:57 +01:00
Thomas Wiese 4c9442f8d5 Merge branch 'permission-vertical' into bug4813 2018-12-07 08:26:32 +01:00
Axel Uhl 9ecf1b5288 Merge branch 'master' into bug4412
Change-Id: I4cd7358449960d5cde2dee0181e79b98997db0b2
2018-12-06 16:31:06 +01:00
Axel Uhl 516d5aacb0 Merge branch 'master' into permission-vertical
Change-Id: Ie55e40f6b736664fdcc385a1cc1fc7f32e849a99
2018-12-06 16:23:38 +01:00
Axel Uhl 52205ea7ee added a BoatClassesResource
Change-Id: Ie77872820e44439c8789d953a1ea6fad93a5ccec
2018-12-06 16:02:06 +01:00
Thomas Wiese b2930b1b8e bug 4813: First draft for defining identifier strategy in HasPermissions
for SecuredDomainTypes and SecureSecurityTypes to hide complexity and
create a single point of responsibilty for identiferAsString-Logic.
2018-12-04 12:46:19 +01:00
Thomas Wiese dd69e9cbf2 Competitor and Boat become SecuredDomainTypes 2018-11-16 11:12:47 +01:00
Manuel Zedel a762e6f76c Merge branch 'master' of gitlab.d-labs.com:external/sap-sailing-analytics into bug4412 2018-11-12 11:40:05 +01:00
Robin Kuck 21d9a1261c Merge remote-tracking branch 'origin/master' into bug4469 2018-11-06 20:42:15 +01:00
Kai Börnert 88545d6f61 initial security check implementation for Home&Dispatch 2018-10-29 18:57:21 +01:00
Steffen Schäfer 9c2ff665a7 Merge branch 'master' into permission-vertical
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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.gateway/webservices/api/v1/index.html
	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
	java/com.sap.sse.security/META-INF/MANIFEST.MF
2018-10-23 13:10:46 +02:00
Kai Börnert d9d5863526 added ability to get the actual Type from a
WithQualifiedObjectIdentifier
2018-10-16 15:22:20 +02:00
Manuel Zedel df4f3ae1fd Merge branch 'master' of gitlab.d-labs.com:external/sap-sailing-analytics into bug4412 2018-10-12 15:58:18 +02:00
Kai Börnert 9a34f85147 permission-vertical formatting fix & made android compile again 2018-10-11 18:02:10 +02:00
Kai Börnert c08e8b4369 bug4768 added multiple parts that will explicitly set permissions,
created an interface to allow most ownable objects to directly return
the QualifiedObjectIdentifier
2018-10-10 13:16:16 +02:00
Kai Börnert 74ec961b2f bug4768 reverted unnecessary changes 2018-10-08 13:22:05 +02:00
Kai Börnert efba17668f bug4768 extended migration to more object types, reduced changes
required for this
2018-10-08 13:17:39 +02:00
Kai Börnert c48f0a3a67 bug4768 prototype for more generic ownership migration 2018-10-05 17:39:33 +02:00