Frank Mittag
5fca437a61
fixed CompetitorsAndBoatsInLogAnalyzer and a broken test
2017-12-27 20:37:33 +01:00
Frank Mittag
6f1b629afe
fixed javadoc
2017-12-27 20:36:50 +01:00
Axel Uhl
82bae2888a
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
2017-12-26 22:14:36 +01:00
Axel Uhl
24fc498f5d
bug 4410: adding transient RaceColumnListener in RaceLogRaceTracker that removes race when RaceColumn is removed
...
Change-Id: Idbdac11f78d856179bde8bbda423d9402da9e957
2017-12-26 13:54:52 +01:00
Axel Uhl
583389023c
whitespace changes only
...
Change-Id: Ie7143d7b64ac8ee6b6d9a3b084daa9caa7cd0638
2017-12-26 13:44:03 +01:00
Axel Uhl
a3639060ef
removed unused addRaceColumnToSeries method
...
Change-Id: I1ba7eb4371791fbee3a702e83bc666bb02c23d3c
2017-12-26 13:36:06 +01:00
Axel Uhl
84c552b015
removed unused removeRaceColumnFromSeries method
...
Change-Id: Ia1ade93b502730604b6e8c19889426b05e1c417a
2017-12-26 13:35:13 +01:00
Axel Uhl
0576079a6f
use constant for background color to avoid redundancies
...
Change-Id: Ia8392793365a6ee531982f82f8e5f32763244d3b
2017-12-26 12:57:50 +01:00
Axel Uhl
3d7e931acd
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
2017-12-26 12:30:02 +01:00
Axel Uhl
0a35f32896
formatting changes only
...
Change-Id: Ic7d9ddeb457db195b4e1da95cbe2c4dc41d550da
2017-12-26 12:28:04 +01:00
Axel Uhl
9e45ad4c3b
Merge commit '171eb3a94f9e368f37aaff7fb815468f33136c09'
2017-12-26 12:27:22 +01:00
Axel Uhl
bdbeed1356
Merge commit 'ddef648ff729a5856ff599e8f8279df06c8c0b8a'
...
Used -s ours because log had already been removed and rename had already happened
2017-12-26 12:26:27 +01:00
Axel Uhl
028f0edc57
Merge commit '03bd1a134cfb9d1fdb210a3a979564b1a4a62a79'
...
I "cherry-picked" this commit manually and am now merging with -s ours.
The rename is useful. The implementation I already added on bug2822
is a lot simpler and will happen there.
2017-12-26 12:22:19 +01:00
Axel Uhl
280bc42e91
"cherry-picking" the rename of commit 03bd1a134c
...
Change-Id: Ifc17c5f1d93d1e6f0435a4c054550d68bb74ba7c
2017-12-26 12:21:29 +01:00
Axel Uhl
ddc48ebe73
bug 4411: use a comparator on the boat display name to establish a reasonable ordering in the pairing list display
...
Change-Id: Idd190e7ab279ae79c880797c827575e118070e2c
2017-12-26 12:00:15 +01:00
Axel Uhl
4255e2f4b3
require enough boats for pairing list; improved display of empty slots in pairing list
...
Change-Id: I949446a8a5a324b1f11f73cd74384adce90b9e63
2017-12-26 11:11:02 +01:00
Axel Uhl
c4c9a85190
removed redundancy between PairingListEntryPoint and PairingListPreviewDialog
...
Change-Id: Ie3e3ba1fd410cd97a86c1b5984fec26f534d9ce8
2017-12-25 23:42:57 +01:00
Robin Kuck
171eb3a94f
bug3484 removed solved todo
2017-12-25 20:47:05 +01:00
Axel Uhl
f4c070c069
adjusted merge artifacts regarding Expedition one-button import with bug2822
...
Change-Id: Id167e9ed51f30796c2ae35475a15cedbb15291b4
2017-12-25 15:00:58 +01:00
Axel Uhl
8a9a1ee4cf
fixed merge artifact in RaceDefinition regarding competitorsAndTheirBoats map
...
Change-Id: I3e8d8786e6cf3f79df8790cbb643d9e915b1b68c
2017-12-25 14:57:14 +01:00
Axel Uhl
bee38aa577
fixed duplicate StringMessage boat()
...
Change-Id: Id9ec56319031858067a7aebef775d0d98d4b75ae
2017-12-25 14:56:37 +01:00
Axel Uhl
4738063b93
cleaned up merge tasks for PairingList stuff in context of bug2822
...
Change-Id: I8fb7178169397e4e5493fab043bc4a70f5fcdba9
2017-12-25 14:55:17 +01:00
Axel Uhl
8d8bb02ff7
cleanup after changing RaceDefinition.getBoatOfCompetitorById to getboatOfCompetitor
...
Change-Id: Id0ac32249ec7e913dc13a00ebe2fbfd85ca2fb62
2017-12-25 14:41:20 +01:00
Axel Uhl
0451fab1d2
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: Id8ebf0c05a7a269c2f98342af1f43970127532ab
2017-12-25 12:52:32 +01:00
Axel Uhl
7044dba3df
added PairingList module to pom.xml
2017-12-24 09:54:40 +01:00
Maximilian Gross
7241d7d2e4
Updated Sailing events media content (markdown)
2017-12-23 21:05:08 +00:00
Maximilian Gross
59aca6a701
Updated Sailing events media content (markdown)
2017-12-23 21:01:04 +00:00
Generic Wiki User
11e2ecce19
Merge branch 'master' of ssh://127.0.0.1/home/trac/git
2017-12-23 21:00:07 +00:00
Maximilian Gross
f25f9f719d
Updated Sailing events media content (markdown)
2017-12-23 20:51:41 +00:00
Axel Uhl
7daf1656e0
Merge remote-tracking branch 'server/master'
2017-12-23 21:51:38 +01:00
Maximilian Gross
cd8c334896
Updated Manage media content (markdown)
2017-12-23 20:50:13 +00:00
Maximilian Gross
9df0cc0cf5
Updated Manage media content (markdown)
2017-12-23 20:49:10 +00:00
Axel Uhl
c06623268a
Merge remote-tracking branch 'server/master'
2017-12-23 21:49:03 +01:00
Maximilian Gross
83b697e0b0
Updated Manage media content (markdown)
2017-12-23 20:47:00 +00:00
Axel Uhl
1bf641c2bf
added PairingList to build.properties to expose entry point html/css
...
Change-Id: I0dd008588a83d8b6be86e4a6de1aba97ce3c8970
2017-12-23 21:46:36 +01:00
Maximilian Gross
c2c3a66239
Updated Manage media content (markdown)
2017-12-23 20:46:18 +00:00
Maximilian Gross
17af08006f
Updated Manage media content (markdown)
2017-12-23 20:33:41 +00:00
Maximilian Gross
a60e7b2182
Updated Manage media content (markdown)
2017-12-23 20:15:28 +00:00
Maximilian Gross
6ffa8cf112
Updated Sailing events media content (markdown)
2017-12-23 19:57:33 +00:00
Maximilian Gross
0a8cf90dc9
Updated home (markdown)
2017-12-23 19:55:57 +00:00
Maximilian Gross
af60dff3bf
Updated Sailing events media content (markdown)
2017-12-23 19:54:33 +00:00
Maximilian Gross
02ad5b3362
Created media (markdown)
2017-12-23 19:53:55 +00:00
Maximilian Gross
7805a94a20
Updated Manage media content (markdown)
2017-12-23 19:49:22 +00:00
Maximilian Gross
75b1d88468
Updated Manage media content (markdown)
2017-12-23 19:48:33 +00:00
Maximilian Gross
e611266ee1
Updated Manage media content (markdown)
2017-12-23 19:42:00 +00:00
Maximilian Gross
9cce799a3f
Updated Manage media content (markdown)
2017-12-23 19:29:09 +00:00
Maximilian Gross
d91af8250f
Updated Manage media content (markdown)
2017-12-23 19:13:17 +00:00
Maximilian Gross
c8aba4b6ed
Updated Manage media content (markdown)
2017-12-23 19:12:35 +00:00
Maximilian Gross
cf0bb4418c
Updated Manage media content (markdown)
2017-12-23 19:10:03 +00:00
Maximilian Gross
e11f314496
Updated Manage media content (markdown)
2017-12-23 19:03:21 +00:00