Commit Graph
2109 Commits
Author SHA1 Message Date
Peter Siegmund ac6fa119a7 replaced picker scale with constant values in resources 2015-06-23 11:59:09 +02:00
Peter Siegmund 8e66696b2c added new preferences to regatta defaults 2015-06-23 09:39:46 +02:00
Peter Siegmund 2be738b7eb Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop 2015-06-22 17:39:26 +02:00
Peter Siegmund 893efea4f9 new logout icon in the Navigation Drawer 2015-06-21 14:50:41 +02:00
Peter Siegmund 54441c9d0d new login screen texts 2015-06-21 14:50:21 +02:00
Peter Siegmund 35105ca801 sorting flags by name in preferences 2015-06-20 13:57:23 +02:00
Peter Siegmund ddadfc0165 Change unit test to mockito 2015-06-20 12:02:57 +02:00
Peter Siegmund 89a4f0f051 Merge branch 'ubilabs--rcapp--feature--finishing-since' into ubilabs--rcapp--develop 2015-06-20 10:52:41 +02:00
Peter Siegmund e3b4f45cea RCApp: show time since finishing start 2015-06-20 10:50:56 +02:00
Peter Siegmund 88495f692f activate junit tests in Shared, Tracker and Buoy projects (with some easy tests) 2015-06-19 15:29:41 +02:00
Peter Siegmund 9e908b5cb5 Bug 2817 - By Marks Coursdesigner - Not Working
change from onLongClick to onClick
2015-06-19 14:16:40 +02:00
Axel Uhl 6112b16b26 checked in launch configuration for RCApp unit tests 2015-06-19 13:11:20 +02:00
Axel Uhl 3b5de63375 construct managed race identifier in test case using ManagedRaceIdentifierImpl 2015-06-19 13:09:10 +02:00
Peter Siegmund 9410b6b557 added missing escape sequence 2015-06-19 12:37:30 +02:00
Peter Siegmund 78817ac60a added JVM/Junit testing to RCApp (and renamed the UI test folder) 2015-06-19 12:08:48 +02:00
Peter Siegmund c2cce35d7c Merge branch 'master' into ubilabs--rcapp--develop 2015-06-19 11:02:27 +02:00
Axel Uhl a422fc0ddf added Javadoc 2015-06-19 10:55:44 +02:00
Peter Siegmund 9b495f9d09 fix for RaceStateService 2015-06-19 10:22:11 +02:00
Peter Siegmund 4337655aaf Merge branch 'master' into ubilabs--rcapp--master 2015-06-19 08:36:31 +02:00
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 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