29182 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Axel Uhl	cea5937612	Merge branch 'master' into bug3345	2015-11-17 22:04:25 +01:00
Axel Uhl	cf5c193ec5	made test case for bug 3364 succeed for correct implementation; extended interval of fixes whose position estimation is affected: ... so far, the getEstimatedPositionTimePeriodAffectedBy method on GPSFixTrackImpl returned only the singular interval shaped by the fix just added; this seems non-sensical given that when such a fix is inserted, the adjacent fixes before and after and everything in between will have their position estimation affected as well.	2015-11-17 21:23:56 +01:00
Axel Uhl	78ff64b7b9	fixed the test case so that it really fails again for the pre-fix state	2015-11-17 18:34:50 +01:00
Axel Uhl	0af2af5979	provided a fix, also for the test case, for bug 3364: use iterator to remove cache elements to avoid CME	2015-11-17 18:27:16 +01:00
Axel Uhl	d6e25bb867	added a failing test case for bug 3364: cause multiple cache entries, force CME, then assert that cache result needed to be recomputed (which currently it isn't)	2015-11-17 18:17:26 +01:00
Axel Uhl	f3e0a276b6	fix for bug 3367: CompetitorDTOImpl.getSailID() must return null when boat is null	2015-11-17 16:59:45 +01:00
Axel Uhl	302a113da1	replaced Jackson LGPL target platform bundles by Apache-licensed versions	2015-11-17 09:43:20 +01:00
Axel Uhl	f3043d5937	allow RaceBoardPanel to operate without competitor chart and wind chart and mark passing editing panel is screen is small; bug 3345	2015-11-16 18:15:13 +01:00
Axel Uhl	a3d7af5bf0	coding conventions	2015-11-16 18:14:48 +01:00
Axel Uhl	795a98f8aa	Merge branch 'blogintegration' ... Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml	2015-11-16 15:31:57 +01:00
Axel Uhl	2d039b024d	set file encoding for russian TextMesages to UTF-8	2015-11-16 15:18:44 +01:00
Axel Uhl	3ab795ee7b	added Russian and Chinese translations for Blog ... Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_ru.properties java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml	2015-11-16 15:11:55 +01:00
Axel Uhl	2cd993e44b	fixed merge results for Header.ui.xml after adding Blog and moving text messages from StringMessages to TextMessages	2015-11-16 15:10:11 +01:00
Axel Uhl	a523c26fd3	Merge branch 'bug3296' into blogintegration ... Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties	2015-11-16 15:08:17 +01:00
Axel Uhl	1a5dd70611	added Russian and Chinese translations for Blog	2015-11-16 14:59:28 +01:00
Axel Uhl	7231e75f69	Merge remote-tracking branch 'server/blogintegration' ... Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml	2015-11-16 14:45:21 +01:00
Axel Uhl	403727ef40	fixed spelling of RaceCommittee enum literal	2015-11-16 11:15:46 +01:00
Axel Uhl	8cadeb43b1	removed logging for calendar link response	2015-11-16 11:13:15 +01:00
Axel Uhl	c55ed74fc9	exception handling in case unknown solutions tab is requested; defaulting to SAP in Sailing	2015-11-16 11:12:08 +01:00
Axel Uhl	c633d6d0c9	null-check for navigationTab parameter in Solutions.scrollToView; defaulting to sapInSailingDiv	2015-11-16 11:08:17 +01:00
Axel Uhl	5548cc5311	removed GWT.debugger() statement	2015-11-16 11:04:26 +01:00
Axel Uhl	4c3da325bb	Merge remote-tracking branch 'server/master'	2015-11-16 10:13:42 +01:00
Axel Uhl	ab0b6754e1	special handling for calendar link	2015-11-16 10:11:21 +01:00
Lennart Hensler	5e1ba04424	Fixed the result units of the Datamining REST API	2015-11-15 15:52:47 +01:00
Lennart Hensler	553a44f8da	Improved the metadata and format of the Datamining REST API	2015-11-15 14:29:15 +01:00
Lennart Hensler	bd2d67f346	Merge remote-tracking branch 'origin/master' into dataMining	2015-11-15 11:43:12 +01:00
Axel Uhl	7fd8016aaf	Merge branch 'master' into bug2822_boatcolors	2015-11-14 17:05:55 +01:00
Axel Uhl	d79018c4d1	fixed typo in StringMessage	2015-11-14 02:24:42 +01:00
Axel Uhl	2bcf6508ce	Merge remote-tracking branch 'server/master'	2015-11-13 18:40:23 +01:00
Axel Uhl	664489ad6b	fixed message properties parameter number	2015-11-13 18:38:40 +01:00
Axel Uhl	a4ca35b7a7	formatting	2015-11-13 18:24:30 +01:00
Lukas Furmanek	0d0f87adb1	Merge branch 'master'	2015-11-13 18:19:02 +01:00
Lukas Furmanek	cf35e20f1b	Lamda compability on Mars and JUnitTest fixed	2015-11-13 18:13:41 +01:00
Axel Uhl	70c44ca125	Merge remote-tracking branch 'server/bug2822_boatcolors' into bug2822_boatcolors	2015-11-13 16:37:25 +01:00
Axel Uhl	e3b2823919	added color provider to CompetitorSelectionModel in EmbeddedMapAndWindChartEntryPoint in case of competitors being shown	2015-11-13 16:28:02 +01:00
Axel Uhl	6deb5114ef	Merge branch 'master' into bug2822_boatcolors ... merge conflicts in EmbeddedMapAndWindChartEntryPoint were due to the parallel insertion of additional entry point URL parameters 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/raceboard/EmbeddedMapAndWindChartEntryPoint.java	2015-11-13 16:25:21 +01:00
fmittag	f0b9b85de4	Merge remote-tracking branch 'origin/bug2822_boatcolors' into bug2822_boatcolors	2015-11-13 16:17:15 +01:00
fmittag	cac08d4e50	added the boat colors to the list of blocked colors in ... CompetitorColorProviderImpl	2015-11-13 16:14:17 +01:00
Axel Uhl	ff272ba201	i18n support in embedded map	2015-11-13 16:06:22 +01:00
Axel Uhl	a5d8fbf449	Merge remote-tracking branch 'server/bug2822_boatcolors' into bug2822_boatcolors	2015-11-13 15:53:53 +01:00
fmittag	59e0582f62	some refactoring to enable the EmbeddedMapAndWindChartEntryPoint to know also about competitor/boat assignments (even when not used yet)	2015-11-13 15:16:49 +01:00
Benjamin Barth	fd0d6ad44f	Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git	2015-11-13 13:52:20 +01:00
Benjamin Barth	911395074e	Merge branch 'solutions'	2015-11-13 13:47:47 +01:00
Benjamin Barth	004037849e	Fixed missing enum value in switch/case statement	2015-11-13 13:44:43 +01:00
fmittag	67fc1157c7	removed unsued 'eventId' parameter from EmbeddedMapAndWindChartEntryPoint	2015-11-13 13:23:21 +01:00
Wiki User	abeb04628c	fixed PREFIX generation in referrer URL	2015-11-13 10:07:31 +00:00
Generic Wiki User	4305dad4d1	Merge branch 'master' of ssh://127.0.0.1/home/trac/git	2015-11-13 09:20:02 +00:00
Benjamin Barth	a094b0548e	Merge branch 'solutions'	2015-11-13 10:19:13 +01:00
Wiki User	2d38da1fb1	filter and group unique referrers in logs by months	2015-11-13 09:19:05 +00:00
Wiki User	3cd2058cd8	convert timestamps to Apache format	2015-11-13 09:18:39 +00:00