eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 14:20:55 +00:00
Code Activity
26,409 Commits 274 Branches 252 Tags
71f289fa3b29fd43de3c8bcf6cafb3e979256baf
Commit Graph
2143 Commits
Author SHA1 Message Date
Axel Uhl eb79a79baa fixed translation texts in RCApp 2015-06-18 20:01:08 +02:00
Axel Uhl 1ca11a4504 fixed post-merge issues, mostly changing race ID from Serializable to String in RCApp 2015-06-18 15:52:52 +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
Peter Siegmund 8fbc09fab8 replaced ProgressDialog with ProgressBar (spinner) as overlay 2015-06-18 12:13:08 +02:00
Peter Siegmund dc367b486a added refresh data into LoginActivity 2015-06-18 12:12:14 +02:00
Peter Siegmund 90594e39fe removed obsolete overflow menu item 2015-06-18 12:10:34 +02:00
Peter Siegmund de64ca4de9 Bug 2900 - In-App update brings crash 2015-06-18 09:44:39 +02:00
Peter Siegmund 925010624f removed warnings 2015-06-17 13:54:37 +02:00
Samuel Oey 39c70dbfa8 Merge branch 'ubilabs--rcapp--bug-2969' into ubilabs--rcapp--develop 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
 2015-06-17 13:45:22 +02:00
Samuel Oey 25f0dd730a Merge branch 'ubilabs--rcapp--bug-2777-proposal' into ubilabs--rcapp--develop 2015-06-17 13:29:37 +02:00
Samuel Oey ac39d97137 just some clarifications 2015-06-17 12:58:47 +02:00
Samuel Oey 1b60479251 moves the forceLogout from DataHelper to SessionActivity to use centralized logout procedure 2015-06-17 12:34:41 +02:00
Samuel Oey 7a6b8e49f9 removes unneeded onReset in LoginActivity 2015-06-17 12:33:50 +02:00
Peter Siegmund 2e2550c938 RCApp: automatically relogin after task kill, if RaceStateService has still data in memory 2015-06-17 11:14:34 +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
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 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
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
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