Axel Uhl
74bd421710
Merge branch 'master' into windestimation
2019-05-28 21:57:39 +02:00
Axel Uhl
89e8bef9c8
Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";
...
according to https://bugs.eclipse.org/bugs/show_bug.cgi?id=544977#c21 the
scenario of using the ManifestBuilder without setting the PluginNature is
not a supported scenario. Besides, it doesn't help to get rid of the new
Eclipse warning regarding non-exported packages.
This reverts commit 063484e29f .
2019-05-28 21:54:20 +02:00
Axel Uhl
4626e4e56a
Merge branch 'master' into windestimation
2019-05-27 23:52:19 +02:00
Axel Uhl
063484e29f
removed PluginNature from our OSGi bundles; they are not Eclipse plugins
2019-05-27 22:53:30 +02:00
Axel Uhl
b6dd97ef8b
Merge branch 'master' into windestimation
...
Change-Id: I1356ad8c307e20dfa114aa2438f6d1d3c5898793
2019-05-15 11:50:29 +02:00
Axel Uhl
0dbd2f4f45
publish non-public competitor data only if READ permission is provided; otherwise still serialize public information if READ_PUBLIC is given
...
Change-Id: I536ec02b6051f22a849393452b80de098fc1e29f
2019-05-04 17:57:21 +02:00
Axel Uhl
b53c4bd44f
Merge branch 'master' into windestimation
2019-04-27 01:25:52 +02:00
Axel Uhl
242513b42e
Merge branch 'master' into permission-vertical
2019-04-13 08:25:19 +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
46ad08a028
upgraded all projects to JavaSE-1.8
...
Change-Id: I7282315d63d2aa0fa5413358d584dfbcf9ff163d
2019-04-05 22:30:18 +02:00
Axel Uhl
890a6c25f8
upgraded all projects to JavaSE-1.8
...
Change-Id: I7282315d63d2aa0fa5413358d584dfbcf9ff163d
2019-04-05 11:40:21 +02:00
Robert Benedikt
97fa96e53c
Fix NullPointerException when scanning deprecated device config
2019-03-14 10:57:29 +01:00
Axel Uhl
850a904d63
refactored DeviceConfiguration stuff, removing matcher design, introducing UUIDs
...
Change-Id: Iec8555a3f1a3cb5a52ed272e4560226e4de654d7
2019-03-01 13:24:42 +01:00
Vladislav Chumak
342df888b7
Merge remote-tracking branch 'origin/master' into windestimation
2019-01-25 19:12:22 +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
2ede9c12c2
reverted mail generation-related changes on bug4412; see also bug4720_mail
...
Change-Id: I3fb3eeeb9881c1888c2cfa18744a808ff712e6b0
2019-01-07 14:49:22 +01:00
Axel Uhl
8fc812c151
Merge branch 'master' into bug4412
...
Change-Id: Ib9c8c136fe6d6b0330822f0b583319a61c1400e7
2019-01-03 16:16:20 +01:00
Vladislav Chumak
20a99c77e9
Merge remote-tracking branch 'origin/master' into windestimation
2018-12-07 15:10:35 +01:00
Axel Uhl
523ebdd36a
Merge branch 'master' into permission-vertical
...
Change-Id: If8263dddd1412bb282fa7504ae56e5cf653eec58
2018-12-07 09:14:11 +01:00
Axel Uhl
4eef1fc182
fixed issues with BoatClassSerializer in case no additional data is present
...
Change-Id: I0858788ddcd786e60bc8dcde7dd5183a79c8dd0f
2018-12-07 09:13:20 +01:00
Axel Uhl
3e1fd4d89e
Merge branch 'master' into permission-vertical
...
Change-Id: I7d8d8c2baa05eb066997de41f9e643e8f1128c01
2018-12-07 00:31:39 +01:00
Axel Uhl
0262e5268a
aligned boat class icon file names with BoatClassMasterdata enum literals and expose icons through gwt.ui web bundle;
...
added icon URLs and further fields to BoatClassesResource
Change-Id: Ib0bc71521fbe173883ff9d55524a338f0b672f5b
2018-12-07 00:28:56 +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
Vladislav Chumak
ccf4b367ff
Merge remote-tracking branch 'origin/master' into windestimation
2018-11-06 15:08:38 +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
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
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
D067890
7708222141
bug4104: First approach of implementing image service
2018-09-25 16:05:56 +02:00
Axel Uhl
19627ee2fe
Merge branch 'master' into permission-vertical;
...
converted uses of Mode.* to DefaultModes.*
Change-Id: I2790463b1df68a1616971996d20aa4bd5dbbe1d7
2018-09-13 17:55:24 +02:00
RobinFleige
ec60c3d679
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
2018-09-13 15:04:17 +02:00
Vladislav Chumak
b2c707e344
Merge remote-tracking branch 'origin/master' into windestimation
2018-09-12 05:36:48 +02:00
Simon Pamies
770b65da3a
Added null checks as value returned by JSON might be empty
2018-09-07 21:12:42 +02:00
Simon Pamies
c5a9b737bb
Making deserialization more robust against different types of numbers
2018-09-07 17:49:51 +02:00
Henri Kohlberg
af5e57c9a2
Bug 4104: Improved JavaDoc coverage and removed unused classes.
2018-09-05 15:05:29 +02:00
D067890
3780459f64
bug4104: Private tags are nor stored in the user storage
2018-08-27 18:37:20 +02:00
Manuel Zedel
f3646d63b3
unified quotes
2018-08-22 15:31:16 +02:00
Manuel Zedel
bcc2fa9f22
streamlined dependencies
2018-08-22 15:24:45 +02:00
D067890
bd52f60cd8
bug4104: Public/Private works
2018-08-16 15:55:49 +02:00
D067890
c79f6d2cee
bug4104: While creating tag or button you can set isVisibleForPublic
2018-08-16 13:38:16 +02:00
D067890
208f5663ed
bug4104: Tags contain boolean isPublic field
2018-08-16 11:47:57 +02:00
Manuel Zedel
5bd74b5068
serialization and persistence adjusted
2018-08-08 22:00:48 +02:00
Vladislav Chumak
86ccc583b4
Merge remote-tracking branch 'origin/master' into windestimation
2018-07-25 12:50:22 +02:00
Axel Uhl
f213912fec
Merge branch 'master' into permission-vertical
2018-07-19 23:18:44 +02:00
Manuel Zedel
269095c0f1
android lint fixes
2018-07-19 19:00:15 +02:00
Manuel Zedel
5170f126e2
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412
2018-07-19 18:54:14 +02:00
Manuel Zedel
a08ec2b8d7
import formatting
2018-07-19 18:52:59 +02:00
Manuel Zedel
d0baf771b8
removed deprecated sub-package version information
2018-07-19 17:51:25 +02:00
Manuel Zedel
93719ecdf0
gradle api level upgrade
2018-07-19 17:12:56 +02:00
Henri Kohlberg
028caf907a
Bug 4104: Removed username from RaceLogTagEvent as this information is laready saved in author object.
2018-07-19 17:02:32 +02:00
Henri Kohlberg
85855bfec7
Merge branch 'bug4104' of ssh://sapsailing.com/home/trac/git into bug4104
...
# Conflicts:
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogTagEventSerializer.java
2018-07-19 08:36:49 +02:00