 Axel Uhl
|
86c156f7a9
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-06-18 15:55:14 +02:00 |
|
|
Axel Uhl
|
bab6a51fc7
|
Merge remote-tracking branch 'server/master'
|
2015-06-18 15:54:35 +02:00 |
|
|
Axel Uhl
|
d7c053314b
|
fixed merge problem to make compilable again
|
2015-06-18 13:47:03 +02:00 |
|
|
Axel Uhl
|
535654593c
|
Merge branch 'master' into jbross-dependent-race-start
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
|
2015-06-18 13:45:50 +02:00 |
|
 fmittag
|
bbcea87fa4
|
one more improvement for the race list (time format)
|
2015-06-18 11:31:13 +02:00 |
|
|
fmittag
|
a2de23abf4
|
improved races list view for small form factors
|
2015-06-18 11:08:34 +02:00 |
|
|
Axel Uhl
|
32f44fc669
|
more logging in case MarkPassingCalculator thread terminates / ends
|
2015-06-18 01:26:50 +02:00 |
|
|
Axel Uhl
|
3c87e50919
|
fixing commit 2973 by adding synchronization on the competitor's candidate sets
|
2015-06-18 01:25:45 +02:00 |
|
|
Axel Uhl
|
3f5381ec9e
|
don't stop mark passing calculator only because race reaches status FINISHED. More events, e.g., form the RaceLog may be coming. Fixes bug 2974.
|
2015-06-18 01:20:35 +02:00 |
|
|
Axel Uhl
|
1579d0ef26
|
fixed NPE in CandidateChooserImpl
|
2015-06-18 00:24:40 +02:00 |
|
|
Axel Uhl
|
39baea5873
|
use a synchronized set to fix bug 2973; however, now I'm seeing a NPE at a different spot. Related?
|
2015-06-18 00:22:08 +02:00 |
|
|
Axel Uhl
|
39573c8928
|
using setInnerHTML instead of setInnerText in order to set labels to ; see bug 2972
|
2015-06-17 22:31:50 +02:00 |
|
|
fmittag
|
d502d65c73
|
Merge remote-tracking branch 'origin/master'
|
2015-06-17 20:38:34 +02:00 |
|
|
fmittag
|
13acdd4684
|
changed the BoatClassImageResolver to return always a valid boat class image
|
2015-06-17 20:38:07 +02:00 |
|
 Steffen Schaefer
|
2d735a532f
|
Changes to not use java.util.Locale.forLanguageTag as it isn't supported
in Android API < 21
|
2015-06-17 16:20:01 +02:00 |
|
 Christopher Ronnewinkel (D036654)
|
203e0fbfc8
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-06-17 15:30:51 +02:00 |
|
|
fmittag
|
000a7f0720
|
Merge remote-tracking branch 'origin/master'
|
2015-06-17 15:22:57 +02:00 |
|
|
fmittag
|
e10236faee
|
added some more boat classes to masterdata class
|
2015-06-17 15:22:26 +02:00 |
|
 Simon Pamies
|
895cc387f6
|
Merge remote-tracking branch 'origin/master'
|
2015-06-17 14:15:46 +01:00 |
|
|
Simon Pamies
|
5d499ed8d0
|
2958 fixed
|
2015-06-17 14:15:32 +01:00 |
|
|
Axel Uhl
|
0960c79835
|
Merge branch 'ubilabs--rcapp--master'
|
2015-06-17 15:01:42 +02:00 |
|
|
Axel Uhl
|
f7d263a003
|
Merge remote-tracking branch 'server/master'
|
2015-06-17 15:00:44 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
1badef86a4
|
scale "selected"-cross in simulation-legend;
|
2015-06-17 13:59:55 +02:00 |
|
|
Steffen Schaefer
|
7b904b191a
|
Fixed limiting event news
|
2015-06-17 11:29:51 +02:00 |
|
|
Steffen Schaefer
|
3e5e577228
|
Merge remote-tracking branch 'origin/master' into design2015
|
2015-06-17 11:06:13 +02:00 |
|
|
Steffen Schaefer
|
0b62b1c9c1
|
Using VideoDTO for event overview video stage to fix compiler error
|
2015-06-17 11:05:10 +02:00 |
|
|
Steffen Schaefer
|
a0402c9eca
|
Implemented limit for event news
|
2015-06-17 10:48:42 +02:00 |
|
 Peter Siegmund
|
84d59495c4
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-17 09:25:35 +02:00 |
|
|
Peter Siegmund
|
5090542d89
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-06-17 09:19:24 +02:00 |
|
|
Axel Uhl
|
3a698ab60d
|
Merge branch 'master' into ubilabs--rcapp--develop
Conflicts:
mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
|
2015-06-17 01:05:03 +02:00 |
|
|
Axel Uhl
|
5694d330dd
|
Merge remote-tracking branch 'server/master'
|
2015-06-17 01:02:35 +02:00 |
|
|
fmittag
|
732d45c1be
|
added another alternative name for the 2.4mR boat class
|
2015-06-16 22:04:03 +02:00 |
|
|
Axel Uhl
|
87e10b6b65
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-16 21:42:20 +02:00 |
|
|
Axel Uhl
|
c284747c2f
|
removed obsolete .project file from com.sap.sailing.mongodb
|
2015-06-16 21:41:53 +02:00 |
|
|
Axel Uhl
|
ddc738d5a5
|
added null safety to RaceSummaryFragment after having seen NPEs in debug mode when a race is reset while showing the summary fragment
|
2015-06-16 21:16:07 +02:00 |
|
|
fmittag
|
71f0c7b87a
|
added title to selected video in media page
|
2015-06-16 18:13:10 +02:00 |
|
 Samuel Oey
|
7a5ff9244f
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-16 17:54:30 +02:00 |
|
|
fmittag
|
4f29dea097
|
added new media attributes to images and videos in MediaDTO
|
2015-06-16 16:59:09 +02:00 |
|
|
Axel Uhl
|
56e8cdad4d
|
consolidated imports to avoid warnings
|
2015-06-16 16:40:34 +02:00 |
|
|
Peter Siegmund
|
80611086a0
|
Merge branch 'master'
|
2015-06-16 16:10:23 +02:00 |
|
|
fmittag
|
1d54a57355
|
Merge remote-tracking branch 'origin/master' into design2015
|
2015-06-16 15:25:38 +02:00 |
|
|
fmittag
|
3cbfb8d29f
|
Merge remote-tracking branch 'origin/design2015-news'
|
2015-06-16 15:23:04 +02:00 |
|
|
fmittag
|
b929c0fb0b
|
Merge remote-tracking branch 'origin/design2015' into design2015
|
2015-06-16 15:11:00 +02:00 |
|
|
fmittag
|
3843719f1e
|
fixed live race state view for races with state 'general recall'
|
2015-06-16 14:58:21 +02:00 |
|
|
fmittag
|
8fe099d7d9
|
improved storage of migration event domain objects
|
2015-06-16 13:34:48 +02:00 |
|
|
Steffen Schaefer
|
0144e93f6c
|
Merge remote-tracking branch 'origin/bug2921' into design2015
|
2015-06-16 13:13:31 +02:00 |
|
|
Steffen Schaefer
|
92028ccf99
|
Merge branch 'design2015-news' into design2015
|
2015-06-16 13:13:11 +02:00 |
|
|
Steffen Schaefer
|
fc4dbd7913
|
News Box is only added for live events
|
2015-06-16 13:09:52 +02:00 |
|
|
fmittag
|
397827deef
|
Merge remote-tracking branch 'origin/design2015' into bug2921
|
2015-06-16 13:09:44 +02:00 |
|
|
Peter Siegmund
|
3ac136297e
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-16 09:36:48 +02:00 |
|