 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 |
|
 Alexander Ries
|
a0000140f6
|
changed text of startline advantage widget
|
2015-06-17 10:45:27 +02:00 |
|
|
Alexander Ries
|
a1ebe9d79c
|
changed size of LiveAveragePanel unit field
|
2015-06-17 10:42:11 +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 |
|
|
Alexander Ries
|
be21942b15
|
hand over strings an no null values as trackedBasedTest createTestTrackedRace in RaceExecutionOrderTests
|
2015-06-17 09:06:17 +02:00 |
|
|
Peter Siegmund
|
d7860a2000
|
Deleted test projects, because the real tests are in the "tests"-folder of each app.
|
2015-06-17 08:57:47 +02:00 |
|
 Axel Uhl
|
84de683a82
|
fixed imports to keep things compilable
|
2015-06-17 01:23:56 +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 |
|
|
Axel Uhl
|
fe03b5f3fd
|
manually cherry-picked the essential NPE avoidance from commit 612191da42 into master
|
2015-06-17 00:57:59 +02:00 |
|
|
Axel Uhl
|
0c76ad12ab
|
factoring commonalities between the different onReset() implementations and (temporarily?) re-activating the "Reload" menu item
|
2015-06-16 23:44:26 +02:00 |
|
|
Axel Uhl
|
ade3c5aed0
|
letting SessionActivity handle the reload menu item
|
2015-06-16 23:27:25 +02:00 |
|
|
Axel Uhl
|
e76a8a954e
|
some Javadoc
|
2015-06-16 23:22:40 +02:00 |
|
|
Axel Uhl
|
91cbb8b9d6
|
keep onReset() in LoginActivity alive in case the "Reload" menu item is re-activated
|
2015-06-16 22:53:12 +02:00 |
|
|
Alexander Ries
|
719179fbcf
|
formatted parts of EventLogo
|
2015-06-16 22:45:13 +02:00 |
|
|
Alexander Ries
|
79aeb1c8a6
|
sovled master merge conflicts in dashboards EventLogo
|
2015-06-16 22:43:12 +02:00 |
|
|
Axel Uhl
|
8a14c0a35f
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
|
2015-06-16 22:40:33 +02:00 |
|
|
Axel Uhl
|
fe18bbeceb
|
organized imports to avoid warnings
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
|
2015-06-16 22:39:10 +02:00 |
|
|
Axel Uhl
|
542df85766
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal
|
2015-06-16 22:37:33 +02:00 |
|
|
Axel Uhl
|
52c7c5806f
|
organized imports to avoid warnings
|
2015-06-16 22:23:55 +02:00 |
|
 fmittag
|
732d45c1be
|
added another alternative name for the 2.4mR boat class
|
2015-06-16 22:04:03 +02:00 |
|
|
Alexander Ries
|
0100abaa73
|
added javadoc to RaceExecutionOrderProvdiderAttachDetachTest and made the code more clean
|
2015-06-16 21:53:18 +02:00 |
|
|
Axel Uhl
|
430d31b75a
|
Merge branch 'master' into ubilabs--rcapp--bug-2777-proposal
|
2015-06-16 21:46:33 +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
|
65fdf3ba56
|
consolidated imports
|
2015-06-16 21:22: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 |
|
 Samuel Oey
|
95e55b6468
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/BaseActivity.java
|
2015-06-16 20:10:20 +02:00 |
|
|
Samuel Oey
|
1e5684856b
|
Merge branch 'ubilabs--rcapp--bug-2967' into ubilabs--rcapp--develop
|
2015-06-16 20:05:10 +02:00 |
|
|
fmittag
|
71f0c7b87a
|
added title to selected video in media page
|
2015-06-16 18:13:10 +02:00 |
|
|
Samuel Oey
|
08cbab66d1
|
Merge branch 'ubilabs--rcapp--bug-2966' into ubilabs--rcapp--develop
|
2015-06-16 17:56:12 +02:00 |
|
|
Samuel Oey
|
7a5ff9244f
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-16 17:54:30 +02:00 |
|
|
Alexander Ries
|
50e1dfd5ba
|
added hasRaceExecutionOrdersAttached() to TrackedRaceImpl
|
2015-06-16 17:51:38 +02:00 |
|
|
Alexander Ries
|
d01cc74c75
|
removed getRaceExecutionOrderProvider() from TrackedRace interface
|
2015-06-16 17:42:08 +02:00 |
|
|
Peter Siegmund
|
eb907f79fe
|
RCApp: refactored gate start fragment
|
2015-06-16 17:29:54 +02:00 |
|
|
Peter Siegmund
|
2c0eeb479a
|
RCApp: removed pass change on start race
|
2015-06-16 17:28:34 +02:00 |
|
|
fmittag
|
4f29dea097
|
added new media attributes to images and videos in MediaDTO
|
2015-06-16 16:59:09 +02:00 |
|
|
Axel Uhl
|
113f5fd5f6
|
trying to fix aspect of bug 2953 explained in comment #12
|
2015-06-16 16:56:04 +02:00 |
|
|
Axel Uhl
|
fa1558030a
|
added comment on bug 2953 regarding InMemoryDataStore.INSTANCE.reset() invocation
|
2015-06-16 16:45:31 +02:00 |
|
|
Axel Uhl
|
56e8cdad4d
|
consolidated imports to avoid warnings
|
2015-06-16 16:40:34 +02:00 |
|
|
Alexander Ries
|
21b67b077e
|
RaceExecutionOrderProvder get removed from race if racecolumn get removed from flexibleleaderboardImpl
|
2015-06-16 16:37:43 +02:00 |
|
|
Peter Siegmund
|
80611086a0
|
Merge branch 'master'
|
2015-06-16 16:10:23 +02:00 |
|
 Steffen Tobias Wagner
|
0a4e7cbdc3
|
inserted git branch for kw2015
|
2015-06-16 13:59:54 +00:00 |
|
|
Steffen Tobias Wagner
|
b9e866b43c
|
inserted ELB into server landscape
|
2015-06-16 13:55:19 +00:00 |
|
|
Alexander Ries
|
a110ff1102
|
added getRaceExecutionOrderProvider() to TrackedRace
|
2015-06-16 15:51:18 +02:00 |
|
|
Steffen Tobias Wagner
|
379d2ee1ee
|
Created kieler woche 2015 event wiki page
|
2015-06-16 13:39:20 +00:00 |
|
 Generic Wiki User
|
6f74cb1c35
|
Merge branch 'master' of ssh://127.0.0.1/home/trac/git
|
2015-06-16 13:30:02 +00:00 |
|
|
Samuel Oey
|
d60e0f0cfb
|
adds todo/fixme comment for peter
|
2015-06-16 15:29:37 +02:00 |
|