Commit Graph
1365 Commits
Author SHA1 Message Date
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
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
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 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
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
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
Axel Uhl 9ecf1b5288 Merge branch 'master' into bug4412
Change-Id: I4cd7358449960d5cde2dee0181e79b98997db0b2
2018-12-06 16:31:06 +01:00
Axel Uhl 52205ea7ee added a BoatClassesResource
Change-Id: Ie77872820e44439c8789d953a1ea6fad93a5ccec
2018-12-06 16:02:06 +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
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
D067890 f20fbcb38e Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into
bug4104

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/raceboard/tagging/TagButtonDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFooterPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagModificationPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPanelResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
2018-09-27 10:12:28 +02:00
D067890 7708222141 bug4104: First approach of implementing image service 2018-09-25 16:05:56 +02:00
Henri Kohlberg 8f81ed62b8 Bug 4104: Minor improvements 2018-09-24 11:15:11 +02:00
RobinFleige ec60c3d679 Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104 2018-09-13 15:04:17 +02:00
Henri Kohlberg 89649cddce Bug 4104: Added first draft of REST API for tags. Allows to receive all public tags in general and appends them by private tags in case user is logged in. 2018-09-11 15:38:01 +02:00
RobinFleige f60fee4d42 RefactoringV1 2018-09-05 17:14:29 +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
Joshua Schulz c47625fdff Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/com.sap.sse.security.ui/Security UI.launch
2018-08-20 10:08:56 +02:00
D067890 a19338ab3a bug4104: refactoring part 2 2018-08-20 08:53:02 +02:00
Henri Kohlberg d38c823eda Bug 4104: Major code refactoring, part 1 2018-08-17 15:55:57 +02:00
D067890 bd52f60cd8 bug4104: Public/Private works 2018-08-16 15:55:49 +02:00
D067890 697d271703 Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into bug4104 2018-08-16 14:26:27 +02:00
D067890 f2269e8020 Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into
bug4104

Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogTagEvent.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogTagEventImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/TagDTO.java
2018-08-16 14:26:10 +02:00
Henri Kohlberg dba81066df Bug 4104: Fixed bug where tags with the same content where not cached correctly. 2018-08-16 13:51:55 +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
Henri Kohlberg 606f2f08b2 Bug 4104: Code style improvement 2018-08-16 08:48:11 +02:00
Henri Kohlberg 48ae1ad57d Bug 4104: Improved server side caching of tag events. 2018-08-16 08:48:11 +02:00
Manuel Zedel 60e8eb32c8 Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412 2018-08-13 13:47:48 +02:00
Henri Kohlberg 0f19b955e1 Bug 4104: Added information to display in AdminConsole regarding tag events. 2018-08-13 11:06:22 +02:00
Henri Kohlberg 4d02b1642d Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104 2018-08-13 09:21:40 +02:00
Manuel Zedel a6e5206656 Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4703 2018-08-10 17:19:08 +02:00
Henri Kohlberg b68808faac Bug 4104: Allow revoke of tags from racelog. 2018-08-10 08:53:41 +02:00
Axel Uhl 2458a231cf bug4704: added caching also for another overload of ReadonlyRaceStateImpl.create
Change-Id: I8e231f62d5d091c028d4dc0f1de42730384f3e56
2018-08-09 22:15:16 +02:00
Axel Uhl 6dbbbb1834 bug4713: implemented fix for comment 9; tests locally green
Change-Id: I9466ad6d383bc2072f18cb5ca278eaeb73a48fe3
2018-08-09 17:17:53 +02:00