Commit Graph
13386 Commits
Author SHA1 Message Date
Axel Uhl 5d285b5ec9 Merge branch 'master' into tracapi 2014-05-31 14:42:08 +02:00
Axel Uhl 6171333290 added viewShowMapControls URL parameter to Spectator.html entry point 2014-05-31 14:29:21 +02:00
Axel Uhl 1d2e977ea7 offering the showMapControls URL parameter for RaceBoard.html, defaulting to true 2014-05-31 14:01:59 +02:00
Axel Uhl f5efdd203b migration effort for master data deserialization: provide default UUID for LeaderboardGroupImpl; initialize image and video URL and leaderboardGroup collections in Event 2014-05-31 13:46:33 +02:00
Axel Uhl c1e0bd6628 Merge branch 'master' into tracapi 2014-05-31 10:53:26 +02:00
Axel Uhl 8d5ac1aef7 fixed event JSON serialization tests; mocks needed to mock image/video URLs as well 2014-05-31 10:51:36 +02:00
Axel Uhl 3267116a38 Merge branch 'master' into tracapi 2014-05-31 02:08:51 +02:00
Axel Uhl 71d97063ec made constant for polling interval for remote servers a constant field 2014-05-31 01:50:12 +02:00
Axel Uhl 1bab76b12a moved image and video URL stuff from Event to EventBase so it can be included in REST API serialization/deserialization 2014-05-31 01:42:28 +02:00
Axel Uhl a9eefe1622 moved TrackFileImportDeviceIdentifierImpl into the domain bundle's trackfiles package to avoid serialization dependency from server to gateway 2014-05-31 00:55:21 +02:00
Axel Uhl f9a0bee445 fixed error message 2014-05-31 00:39:29 +02:00
Axel Uhl a941269bd6 show image URLs and video URLs in events table; fixing validation for course area names, image URLs and video URLs in event dialog 2014-05-31 00:33:52 +02:00
Axel Uhl 5ddffba984 working version of the image URL and video URL maintenance in EventDialog 2014-05-30 23:57:05 +02:00
Axel Uhl 7643d21723 populate image and video URL list in EventEditDialog 2014-05-30 23:48:49 +02:00
Axel Uhl 597e0dfc20 added image and video URL list composites to event dialog 2014-05-30 23:45:23 +02:00
Axel Uhl 0f8ac33c49 use ListEditorComposite for course area editing in EventDialog 2014-05-30 23:31:53 +02:00
Axel Uhl 166adb8781 Merge branch 'master' into bug1970 2014-05-30 23:10:25 +02:00
Axel Uhl 1ca46f2835 Merge branch 'master' into tracapi 2014-05-30 23:10:04 +02:00
Axel Uhl 57ddc25c30 allow Deckman importer to fail with exception if format is not recognized 2014-05-30 23:09:38 +02:00
Axel Uhl 68a6e41cbd more Javadoc for the ListEditorComposite framework 2014-05-30 22:59:30 +02:00
Axel Uhl 7a20ea355c formatting and comments in the ListEditorComposite micro-framework 2014-05-30 22:19:13 +02:00
Axel Uhl acd5e1deaf removed obsolete isCollapsed() method from ListViewComposite framework; use i18n in ListViewComposite framework 2014-05-30 21:58:28 +02:00
Axel Uhl 669c63b9e9 Merge branch 'master' into tracapi 2014-05-30 21:26:26 +02:00
Axel Uhl 92f04a56ac fixed build properties and classpath regarding GPSFixImportTest and its resource 2014-05-30 21:25:32 +02:00
Axel Uhl 6202804a68 fixed build properties and classpath regarding GPSFixImportTest and its resource 2014-05-30 21:24:51 +02:00
Axel Uhl d1cee57fb5 Merge branch 'master' into tracapi 2014-05-30 17:25:31 +02:00
Axel Uhl a73d750a75 Merge branch 'master' into bug1970 2014-05-30 17:25:19 +02:00
Axel Uhl 0f5c00c7c1 moved test GPX resource to test bundle so it is found by test case 2014-05-30 17:24:41 +02:00
Axel Uhl f7c3963bc7 renamed stringConstants variables to stringMessages 2014-05-30 17:24:17 +02:00
Axel Uhl e32e69accd consider event's image URLs and video URLs during master data import 2014-05-30 17:09:09 +02:00
Axel Uhl 152f305ea6 added image and video URLs to EventDTO and exchange them between client and server 2014-05-30 17:05:39 +02:00
Axel Uhl 00f49b92e5 added image URLs and video URLs to event; implemented persistence including a test case 2014-05-30 16:38:03 +02:00
Axel Uhl e5c3717e15 Merge branch 'master' into bug1970 2014-05-30 15:07:42 +02:00
Axel Uhl 1a3853b6ff Merge branch 'master' into tracapi 2014-05-30 15:07:12 +02:00
Axel Uhl 3fbc523bd9 added deckman adapter to Selenium startup in pom.xml 2014-05-30 15:06:40 +02:00
Axel Uhl d3c214d945 added missing serializer to git 2014-05-30 15:05:30 +02:00
Axel Uhl be0cf924ba added deckmanadapter to main java/pom.xml, to feature.xml and raceanalysis.product 2014-05-30 15:02:28 +02:00
Axel Uhl 7138fd1afc fixing the sort toggle of the events table in EventManagementPanel. See bug 1970 comments #9 and #10. 2014-05-30 14:54:18 +02:00
Axel Uhl f37e431368 Merge branch 'master' into bug1970 2014-05-30 14:36:27 +02:00
Axel Uhl 772fc78172 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java
2014-05-30 14:30:46 +02:00
Axel Uhl f338872033 fixed some time slider issues with equal min/max values 2014-05-30 14:18:08 +02:00
Axel Uhl 8f4511ced9 pass along from/to times for GPS file import 2014-05-30 13:57:48 +02:00
Axel Uhl 0d0ae3f060 added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format 2014-05-30 10:59:39 +02:00
Axel Uhl 200da4bdff added some Javadoc in the trackfiles import stuff 2014-05-30 10:15:37 +02:00
Axel Uhl 9f771d8bad added missing resources/ folder to build.properties 2014-05-30 09:47:57 +02:00
Axel Uhl f27deba213 Merge branch 'master' into deckman 2014-05-30 09:31:25 +02:00
Fredrik Teschke c8fc3f7435 Merge branch 'master' of sapsailing.com:/home/trac/git into ftes-import-abstract-from-routeconverter 2014-05-30 01:30:51 +02:00
Fredrik Teschke 2396ff0ed7 make file stream reusable in import servlet, and added testcase 2014-05-30 01:28:00 +02:00
Axel Uhl eb64b8f3a7 Merge branch 'master' into bug1970 2014-05-30 00:33:26 +02:00
Axel Uhl ef626e285f Merge branch 'master' into tracapi 2014-05-30 00:32:42 +02:00