Peter Siegmund
e247c8f3cb
added myself into jetty realm
2014-10-24 09:16:54 +02:00
Peter Siegmund
0bc9fe9679
Merge branch 'master' into feature/android_akkutest
2014-10-24 09:14:08 +02:00
Axel Uhl
5419792aa4
reverted security stuff from SailingGWT.launch again...
2014-10-23 18:17:31 +02:00
Axel Uhl
d5083b8e01
downgraded execution environment of com.sap.sse.gwt from 1.8 to 1.7
2014-10-23 18:13:18 +02:00
Peter Siegmund
a513c6752c
insert ContentProvider for SQLite
2014-10-23 13:46:51 +02:00
fmittag
dd7be021c1
Merge remote-tracking branch 'origin/master'
2014-10-22 17:26:14 +02:00
fmittag
f90d107152
removed usage of old BoatTypes enum with usage of BoatClassMasterdata enum in CompetitorEditDialog
2014-10-22 16:57:44 +02:00
Axel Uhl
95726e4534
use Set instead of List for competitorId REST parameter to make lookups faster
2014-10-22 15:29:21 +02:00
Axel Uhl
d57db58938
added parameter competitorId to positions REST API
2014-10-22 15:02:51 +02:00
Axel Uhl
d4d1c2fdf7
fixed SailingGWT launch config again
2014-10-22 13:47:17 +02:00
Axel Uhl
f1daf11a33
added parameter withtack to competitor positions REST API, defaulting to false (INCOMPATIBLE CHANGE), avoiding very expensive calculations on the server
2014-10-22 13:42:48 +02:00
Axel Uhl
7f0efc4a53
Merge remote-tracking branch 'server/master'
2014-10-21 16:20:04 +02:00
Axel Uhl
b52e4bf3e7
removed security stuff again from master after accidental merge
2014-10-21 16:15:32 +02:00
fmittag
cafa5889ee
fix for bug2421: Stage should show last events in chronological order if no live or future events exist
2014-10-21 14:06:11 +02:00
Fredrik Teschke
030798d3ea
shared.android.test -> JavaSE-1.8 (prevent class version errors when launching tests in Eclipse)
2014-10-21 09:23:07 +02:00
Fredrik Teschke
40aace7f3f
Merge branch 'master' of sapsailing.com:/home/trac/git
2014-10-21 08:52:53 +02:00
Fredrik Teschke
c190e8023e
remove trailing slash of server url in device mapping QRCode
2014-10-21 08:52:40 +02:00
Axel Uhl
585637a736
Merge remote-tracking branch 'server/master'
2014-10-20 21:08:49 +02:00
Axel Uhl
ac5f9ec819
as we'll do that for bug 2378 for the user management MongoDB collections, this does it also for the SwissTiming and TracTrac persistence bundles
2014-10-20 16:17:00 +02:00
Axel Uhl
09cddf87b3
as we'll do that for bug 2378 for the user management MongoDB collections, this does it also for the Igtimi persistence bundle
2014-10-20 16:14:45 +02:00
fmittag
f6882ba810
fix for bug 2231: Dependency of newhome code on static resources on web server
2014-10-20 15:16:18 +02:00
Jens Rommel
b2b13e9a0c
Next fix
2014-10-17 13:30:48 +02:00
Jens Rommel
ca97c7dbc3
Fixed typo
2014-10-17 13:27:22 +02:00
Jens Rommel
eb69b3eb11
Changed tycho dependency handling according to
...
http://wiki.eclipse.org/Tycho/Release_Notes/0.21
https://bugs.eclipse.org/bugs/show_bug.cgi?id=436617#c11
2014-10-17 13:21:39 +02:00
Jens Rommel
111486410d
Fiddlig with Java 8 compiler settings...
2014-10-17 11:40:54 +02:00
Jens Rommel
921febb3cd
Tycho config
2014-10-17 11:18:52 +02:00
Fredrik Teschke
55a3dae5a9
fix NPE that occurred when tryitn to manually add device mapping for SmartphoneUUID in AdminConsole
2014-10-16 22:29:08 +02:00
Fredrik Teschke
a12956e16b
Merge branch 'master' of sapsailing.com:/home/trac/git
2014-10-16 22:19:45 +02:00
Fredrik Teschke
79446d4f3a
fix author priority comparison, which was wrong-way-round
2014-10-16 20:59:43 +02:00
Fredrik Teschke
cce34ae877
remove duplicated function of add()-method
...
- the add(event, client) method overrode the add(event) method with pretty much identical functionality
- the only difference was the return value
- but the add(event, client) method was missing one code-line responsible for adding the event id to eventsById
- to prevent such errors, add(event, client) now calls add(event) and just alters the return value
2014-10-16 20:50:34 +02:00
Fredrik Teschke
a8e27d854e
refresh device mappings also after canceling dialog (in case QRCode was scanned)
2014-10-16 20:50:21 +02:00
Fredrik Teschke
cab1458beb
set server RaceLogEventAuthor to highest priority
2014-10-16 20:34:16 +02:00
Fredrik Teschke
3e5d8687da
allow revoking RaceLogEvents of an author with equal priority
2014-10-16 20:33:51 +02:00
fmittag
c354affd67
shortened the description for interpolated scoring scheme
2014-10-16 17:45:17 +02:00
fmittag
01dd4cd995
Merge remote-tracking branch 'origin/master'
2014-10-16 09:19:15 +02:00
fmittag
9719d15add
missed to add the files of the generated autoplay entrypoint to build.properties
2014-10-16 09:18:55 +02:00
Fredrik Teschke
13040fd911
Merge branch 'master' of sapsailing.com:/home/trac/git
2014-10-15 21:47:41 +02:00
Fredrik Teschke
f117ddc434
fix erroneous setting of tracking start and end times
2014-10-15 21:45:30 +02:00
fmittag
8a59e0c26e
added a PopupPositionProvider interface to allow videocontainer to position the video
2014-10-15 18:57:17 +02:00
fmittag
bdba5c9924
implemented fullscreen button for autoplay mode
2014-10-15 17:49:38 +02:00
fmittag
c2549da3af
Merge remote-tracking branch 'origin/master' into tview_newhome
2014-10-15 13:29:49 +02:00
fmittag
e5e211f678
Merge remote-tracking branch 'origin/master'
2014-10-15 13:16:13 +02:00
fmittag
8454dc67e5
added a test for the new scoring scheme with interpolation
2014-10-15 13:12:15 +02:00
fmittag
04c17a99df
implemented a new scoring scheme for the champions league 2014 which interpolates the scores between the min and the max score in case a fleet is starting with less competitors
2014-10-14 19:00:19 +02:00
fmittag
a5c03c00eb
implemented locale change (using a new LocaleChangeEvent and LocaleChangeEventHandler
2014-10-14 14:31:26 +02:00
Fredrik Teschke
25dcadd9ba
Merge remote-tracking branch 'origin/master' into ftes-rltracking-app
2014-10-14 14:17:05 +02:00
fmittag
2632613c89
fixed locale selection in autoplay mode
2014-10-14 13:33:29 +02:00
fmittag
1d4a5a2dc0
Merge remote-tracking branch 'origin/master' into tview_newhome
2014-10-14 12:02:46 +02:00
fmittag
66ea0fe286
implemented a 'hightpoint, winner gets 8 points' scoring scheme for the championsleague
2014-10-13 17:25:11 +02:00
fmittag
d8002da500
implemented locale selection and autoMediaSelection for the raceboard
2014-10-13 17:13:51 +02:00
Peter Siegmund
Axel Uhl
fmittag
Fredrik Teschke
Jens Rommel