Commit Graph
33147 Commits
Author SHA1 Message Date
Axel Uhl d6537007ee a few whitespace and coding convention changes
Change-Id: I29bdabb56323a05cc5c2eabc55174cc774b11c9e
2016-06-06 09:44:50 +02:00
Axel Uhl b37f28ef33 eliminated PerspectiveIdAndSettings
Change-Id: Ia3eaa0980b0bf870ca78e0173af17c96ea97e3e8
2016-06-03 18:10:03 +02:00
Axel Uhl f353521428 removing PerspectiveIdAndSettings.perspectiveId (one of the existential reasons of PerspectiveIdAndSettings...)
Change-Id: Ib236c053c4102c779fc1a70d55641b00afe5886a
2016-06-03 18:00:05 +02:00
Axel Uhl 8a484366bd removed PerspectiveLifecycleAndSettings as it was not used anywhere
Change-Id: I2d65080003bf743b2721712d6899d42593258491
2016-06-03 17:47:03 +02:00
Axel Uhl f8ec511cf2 Merge branch 'master' into bug2610_componentid 2016-06-03 17:44:46 +02:00
Axel Uhl 5d9a1489ad Merge remote-tracking branch 'server/master' 2016-06-03 17:44:33 +02:00
Steffen Tobias Wagner d994e30f23 changed passwd command in ussailling mailsetup 2016-06-03 14:54:05 +00:00
Steffen Tobias Wagner 32cfb5ce94 added section about ussailing mail relaying 2016-06-03 14:46:05 +00:00
Axel Uhl 6e04e49db0 Merge branch 'master' into bug2610_componentid 2016-06-03 15:52:02 +02:00
Axel Uhl 592c44e880 introduced command line options for uploadRepositoryToServer.sh for proxy/tunnel upload
Change-Id: Ib35d0de686c9f4f6660726a5a4bb9fbc69457933
2016-06-03 15:51:39 +02:00
fmittag cf3c335fd3 merged two classes for creating a dialog component for composite perspective settings into one 2016-06-03 13:01:31 +02:00
fmittag 532c9766a3 Fixed getSettingsDialogComponent() in AbstractPerspectiveLifeycycle 2016-06-03 12:44:19 +02:00
Axel Uhl 91ce2c2d55 Merge branch 'bug3683' 2016-06-03 12:05:06 +02:00
Axel Uhl 337ce15ef1 formatting changes only
Change-Id: I43c8bf3de168ffe02e2bb1d05a6b89c387969151
2016-06-03 12:04:57 +02:00
Axel Uhl 341086ff54 fixing NPE issues for XML exporter in case a race has no valid end of race; sampling five wind fixes then
Change-Id: Ieeb8148f04ae2e9bc767a4c34d032ed2f6d3d76b
2016-06-03 10:45:48 +02:00
Axel Uhl a0cc588055 upgraded target platform: org.apache.servicemix.bundles.aws-java-sdk-1.9.8_1.jar replaced by org.apache.servicemix.bundles.aws-java-sdk-1.10.73_1.jar
Change-Id: If049def19299fbfba6ea27f30345b0c6a70b4ef6
2016-06-03 09:19:09 +02:00
fmittag 587b31adce further major simplification of settings dialogs for perspectives 2016-06-02 19:54:43 +02:00
Axel Uhl 51bab1b93f fix for bug 3682: remove a leaderboard group from all events referencing it when removing the leaderboard group
Change-Id: Ifa4a66202a1506c42f74c29037e052fad95ba053
2016-06-01 17:42:07 +02:00
Axel Uhl d1af28800d fix for bug 3681, "greening" the test: removing an overall leaderboard from the server unlinks it from the respective leaderboard group
Change-Id: Id23a781a2e640d8ee68d68e6dae2ec2e85b30a82
2016-06-01 17:34:56 +02:00
Axel Uhl fecedb380a added failing test case for bugs 3681 and 3682
Change-Id: I1d4fa2061b3ff0afecc4f9e8f5d5aeabd5ad3599
2016-06-01 17:29:11 +02:00
Axel Uhl bf7dfa7a6e Merge branch 'ubilabs--tracking_app--bug-2779' 2016-06-01 11:47:47 +02:00
fmittag edd3244f29 some naming cleanup 2016-05-31 18:33:58 +02:00
fmittag 8646f5577d fixed problem with updateSettings() in SimpleDataRetrieverChainDefinitionProvider 2016-05-31 18:33:05 +02:00
fmittag 99c4261787 Changed CompositeSettings to use ComponentIdAndSettings instead of ComponentAndSettings (componentId instead of component instance) 2016-05-31 17:58:24 +02:00
Axel Uhl cf5b6bff9e introduced Component.getId(), defaulting to getLocalizedShortName(). Preparing for using this ID as key for components
and their life cycles in the scope of a perspective

Change-Id: I26b78dac9aba6e629e57a28af54a04d382f753f2
2016-05-31 14:26:52 +02:00
Axel Uhl 57c7ac1e70 consolidated imports
Change-Id: I0d7e02d567db06c70d2aaf718ca8c9011509ad69
2016-05-30 18:24:16 +02:00
Axel Uhl fcd653b822 fixed search test cases which now require the Event--LeaderboardGroup--Leaderboard association to be maintained properly
Change-Id: I84d4b864d5ea25d3e507b0b6ad876f7ba74c4eb1
2016-05-30 18:22:20 +02:00
Axel Uhl 48c85b8ba4 copied _zh_CN to _zh
Change-Id: Ie8a0963f878d9f1f86bb505143f16ce836219f67
2016-05-30 17:18:39 +02:00
Axel Uhl fe1da11be5 Merge branch 'translation' 2016-05-30 17:17:23 +02:00
service.tip.git d5b59ae1a6 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-30 12:21:20 +00:00
service.tip.git 1cad0d04c4 Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com. 2016-05-30 12:19:34 +00:00
Axel Uhl 8afe0b2ad9 fixing XML export for rank gains, using previous leg's finishing rank instead of current leg's rank at leg start
Change-Id: I2686f70aa8f3fb6a711c6491529ae179f3d2c7e7
2016-05-30 12:17:57 +02:00
Axel Uhl aa919b3433 Merge remote-tracking branch 'server/master' 2016-05-30 12:17:25 +02:00
Axel Uhl 53827a9359 fix for searching public events / leaderboards only (bug 3676)
Change-Id: I375fefcac041b3193b5768fca435c4a7032375a3
2016-05-30 12:10:14 +02:00
Axel Uhl 46d8ea8333 adjusted Javadoc
Change-Id: I8704d7eecb153ce789d2bc959135f37c11676de7
2016-05-30 11:03:05 +02:00
Steffen Tobias Wagner (D059727) 0f854e22f4 added optional secondary event for apache 001-events config 2016-05-29 17:59:56 +02:00
EC2 Server fefad09457 changed chmod 777 to 000-macros.conf so that httpd can read it 2016-05-29 11:29:33 +00:00
Steffen Tobias Wagner (D059727) fd577dddd8 added series macro for apache 000-macro.conf 2016-05-29 13:25:13 +02:00
Steffen Tobias Wagner (D059727) f974bede4c moved apache 000-macro.conf to git workspace 2016-05-29 13:25:08 +02:00
Steffen Tobias Wagner 954ae0753b added additional step for AMI image update 2016-05-29 11:16:07 +00:00
Steffen Tobias Wagner aa110135e5 added section about operating windbots near country borders 2016-05-29 08:16:27 +00:00
Axel Uhl 81620b3850 added "Platu25" as an alias name for "Platu 25"
Change-Id: I4c8a7cb794b9ba93525bf018891f00fb0724e4a7
2016-05-28 23:47:09 +02:00
fmittag 78ccf0bd2f Merge remote-tracking branch 'origin/bug3672' 2016-05-24 15:39:08 +02:00
fmittag 3f4bee04b8 added documentaion for the race entries service 2016-05-24 15:30:48 +02:00
fmittag dd918eb7ce added a webservice to retreive the entry list for a race
/api/v1/regattas/{regattaname}/races/{racename}/entries
2016-05-24 15:16:46 +02:00
Steffen Tobias Wagner f4456d53a4 added sailing league server url's 2016-05-21 19:00:18 +00:00
Steffen Tobias Wagner 6ab52d0fe4 added launch config for german league 2016-05-21 18:53:35 +00:00
Axel Uhl 2ae8a6b0c1 fixing "None" passing instruction for single mark start/finish waypoint
Change-Id: Iebce0c1e9fba5940829fedf1bbedfba15c60936c
2016-05-20 17:56:37 +02:00
Axel Uhl b314220429 fixed bug 2418 by checking single mark start/finish correctly now
Change-Id: Iff23d9b11fb04753fd60cc9ae829fdc4fd0fe12a
2016-05-20 17:31:08 +02:00
Axel Uhl a60221d2e5 Merge branch 'translation' 2016-05-20 11:37:05 +02:00