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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Samuel Oey
|
d60e0f0cfb
|
adds todo/fixme comment for peter
|
2015-06-16 15:29:37 +02:00 |
|
Samuel Oey
|
fb4e6091df
|
Merge branch 'ubilabs--rcapp--bug-2966' into ubilabs--rcapp--bug-2967
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartFragment.java
|
2015-06-16 15:23:34 +02:00 |
|
Peter Siegmund
|
62296fbf62
|
RCApp: check if preference "additional golf time" is activated
|
2015-06-16 14:23:21 +02:00 |
|
Peter Siegmund
|
3f79abb216
|
RCApp: show correct time (and not the default values)
|
2015-06-16 12:33:32 +02:00 |
|
Samuel Oey
|
ecefdfcaf2
|
Merge branch 'ubilabs--rcapp--offline-login' into ubilabs--rcapp--develop
|
2015-06-16 12:07:58 +02:00 |
|
Peter Siegmund
|
e012dff07a
|
RCApp: don't reset the data in the service at LoginActivity startup
|
2015-06-16 11:42:10 +02:00 |
|
Samuel Oey
|
6b04b7a1de
|
refactors show protest time dialog in race list fragment
|
2015-06-16 11:39:25 +02:00 |
|
Samuel Oey
|
bc678a78e1
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-16 11:04:34 +02:00 |
|
Samuel Oey
|
a40ac95bfd
|
fixes data consistency check at protest time dialog
|
2015-06-16 11:03:42 +02:00 |
|
Peter Siegmund
|
35fc63fd2b
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-16 11:03:35 +02:00 |
|
Samuel Oey
|
1502a2101d
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal
|
2015-06-16 09:52:54 +02:00 |
|
Samuel Oey
|
4d84cf6b60
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-16 07:32:41 +02:00 |
|
Samuel Oey
|
4a7234ac96
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--bug-2966
|
2015-06-16 07:24:09 +02:00 |
|
Samuel Oey
|
e22918573d
|
Merge branch 'ubilabs--rcapp--bug-2963' into ubilabs--rcapp--develop
|
2015-06-15 19:21:31 +02:00 |
|
Samuel Oey
|
f3468598df
|
extract some methods in MoreFlagsFragment
|
2015-06-15 18:08:38 +02:00 |
|
Samuel Oey
|
5d8c321e08
|
why not using after - much simpler ;)
|
2015-06-15 17:42:11 +02:00 |
|
Peter Siegmund
|
ba7308d303
|
RCApp: change from MainScheduleFragment at RaceStateChanged
|
2015-06-15 17:16:01 +02:00 |
|
Peter Siegmund
|
e1ff27927e
|
RCApp: RaceFlagViewerFragment handles lowerFlags correct now - if lowerFlags != Flags.NONE view second flag view
|
2015-06-15 17:10:33 +02:00 |
|
Peter Siegmund
|
3ccaeb7ea2
|
Fix currentTime == now
|
2015-06-15 17:08:06 +02:00 |
|
Samuel Oey
|
b94e64ae1e
|
don't reset the in memory data store without proper teardown of the race state service. (see bug 2953)
|
2015-06-15 16:59:21 +02:00 |
|
Samuel Oey
|
f512c2ae3b
|
a click on options menu reload uses the resetAll method of data maanger
|
2015-06-15 16:39:08 +02:00 |
|
Samuel Oey
|
792c393f44
|
changing server url in general preferences calls uses data manager to reset all stored data
|
2015-06-15 16:38:25 +02:00 |
|
Samuel Oey
|
4cef28f21c
|
logout from session activity uses data managers unloadAllRaces
|
2015-06-15 16:36:55 +02:00 |
|
Samuel Oey
|
49984a6ff2
|
adds resetAll and unloadAllRaces methods to DataManager
|
2015-06-15 16:35:26 +02:00 |
|
Peter Siegmund
|
25375d9e70
|
removed Eclipse warning
|
2015-06-15 10:26:15 +02:00 |
|
Peter Siegmund
|
a1eaa5c69e
|
Bug 2963 - RaceList - RaceState - Unscheduled but with finishing time
- prevent entering finish time in the future
|
2015-06-12 15:58:58 +02:00 |
|
Peter Siegmund
|
7092a5c22f
|
Hotfix to be able to start the old RCApp without crashes
|
2015-06-12 15:15:47 +02:00 |
|
Peter Siegmund
|
91a22e5e3c
|
RCApp: fixed Lint blocker
|
2015-06-12 11:27:30 +02:00 |
|
Peter Siegmund
|
99f99fb0f8
|
Merge branch 'ubilabs--rcapp--develop' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--develop
|
2015-06-12 10:45:48 +02:00 |
|
Peter Siegmund
|
9b5650f74f
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-12 10:45:41 +02:00 |
|
Peter Siegmund
|
f79d32d484
|
Bug 2953 - Sporadic loss of race log events although displayed in RCApp UI
|
2015-06-12 10:45:31 +02:00 |
|
Samuel Oey
|
ce8ed12a4f
|
inlines a once used method in RaceStateService
|
2015-06-12 09:27:52 +02:00 |
|
Samuel Oey
|
bcbf8a89ab
|
adds some more logging to the sending service layer
|
2015-06-12 09:26:24 +02:00 |
|
Samuel Oey
|
2a2e43a781
|
Don't switch fragments directly after reset. Wait for callback - that is already implemented.
|
2015-06-11 21:17:32 +02:00 |
|
Peter Siegmund
|
bf9301514e
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-06-11 14:54:19 +02:00 |
|
Peter Siegmund
|
05580e291e
|
removed unused (non working) testing project for Tracker App
|
2015-06-11 14:50:28 +02:00 |
|