Commit Graph
267 Commits
Author SHA1 Message Date
Peter Siegmund c580c10f89 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Peter Siegmund 015c4f2d82 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Lukas Zielinski c67653bc21 Fix Bugzilla #2531: Keep qr-scan result when rotating device 2015-01-14 14:26:29 +01:00
Lukas Zielinski 2c41928841 Fix Bugzilla #2531: Keep qr-scan result when rotating device 2015-01-14 14:26:29 +01:00
Peter Siegmund c6e0d9b579 Merge branch 'master' into android_apps
Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/res/values/strings.xml
	mobile/com.sap.sailing.android.tracking.app/pom.xml
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.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/domain/racelog/impl/RaceLogEventsCallback.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
2015-01-13 15:04:22 +01:00
Peter Siegmund f5efb17c75 Merge branch 'master' into android_apps
Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/res/values/strings.xml
	mobile/com.sap.sailing.android.tracking.app/pom.xml
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.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/domain/racelog/impl/RaceLogEventsCallback.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
2015-01-13 15:04:22 +01:00
Lukas Zielinski 725b57eb3e TRACKING APP: Notify user if scanning an already scanned QR-code 2015-01-08 17:01:32 +01:00
Lukas Zielinski 986a2d76e8 TRACKING APP: Notify user if scanning an already scanned QR-code 2015-01-08 17:01:32 +01:00
Lukas Zielinski 0c1d9bafe9 TRACKING APP: Added Hockeyapp SDK 2015-01-07 16:45:48 +01:00
Lukas Zielinski 7ee14fde3b TRACKING APP: Added Hockeyapp SDK 2015-01-07 16:45:48 +01:00
Lukas Zielinski df605fc3c6 TRACKING APP: refactoring how checkin-data is stored 2015-01-06 18:14:26 +01:00
Lukas Zielinski 84c2371583 TRACKING APP: refactoring how checkin-data is stored 2015-01-06 18:14:26 +01:00
Lukas Zielinski bd9ea26d13 TRACKING APP: layout tweaks 2014-12-23 19:17:57 +01:00
Lukas Zielinski 0bd52546fd TRACKING APP: layout tweaks 2014-12-23 19:17:57 +01:00
Lukas Zielinski 1e9d36165a TRACKING APP: added hud layouts for landscape 2014-12-23 19:11:16 +01:00
Lukas Zielinski 468158d8a3 TRACKING APP: added hud layouts for landscape 2014-12-23 19:11:16 +01:00
Lukas Zielinski 5b87a52113 TRACKING APP: smaller header text so icon is centered vertically 2014-12-23 18:40:22 +01:00
Lukas Zielinski c2cf1719b6 TRACKING APP: smaller header text so icon is centered vertically 2014-12-23 18:40:22 +01:00
Lukas Zielinski 00f43266ab TRACKING APP: layout center toolbar text 2014-12-23 18:37:18 +01:00
Lukas Zielinski bafb1aa1de TRACKING APP: layout center toolbar text 2014-12-23 18:37:18 +01:00
Lukas Zielinski 5a89bcf566 TRACKING APP: layout corners 2014-12-23 18:30:57 +01:00
Lukas Zielinski e87b97fa0a TRACKING APP: layout corners 2014-12-23 18:30:57 +01:00
Lukas Zielinski 2d409e64f0 TRACKING APP: fix jumping textview 2014-12-23 17:21:53 +01:00
Lukas Zielinski 8a66a70464 TRACKING APP: fix jumping textview 2014-12-23 17:21:53 +01:00
Lukas Zielinski a1e05d5206 TRACKING APP: strings 2014-12-23 17:05:19 +01:00
Lukas Zielinski ce00af0286 TRACKING APP: strings 2014-12-23 17:05:19 +01:00
Lukas Zielinski e7aa45c2bf TRACKING APP: hud layout 2014-12-23 17:01:56 +01:00
Lukas Zielinski 828ef4071c TRACKING APP: hud layout 2014-12-23 17:01:56 +01:00
Lukas Zielinski 0e4ef59820 TRACKING APP: tracking layout 2014-12-23 15:58:41 +01:00
Lukas Zielinski b2217ad0f5 TRACKING APP: tracking layout 2014-12-23 15:58:41 +01:00
Fredrik Teschke 3c86aaea47 only 1 activity in tracking app 2014-12-23 09:47:24 +01:00
Lukas Zielinski 42968d3899 TRACKING APP: Show popup if GPS is turned off on entry to Tracking Activity, bugzilla ref #2535 2014-12-22 18:29:58 +01:00
Lukas Zielinski f029e78785 TRACKING APP: Show popup if GPS is turned off on entry to Tracking Activity, bugzilla ref #2535 2014-12-22 18:29:58 +01:00
Lukas Zielinski ad321a71bd TRACKING APP: fix layout issue, ref bugzilla #2535 2014-12-22 18:08:10 +01:00
Lukas Zielinski 828111f15a TRACKING APP: fix layout issue, ref bugzilla #2535 2014-12-22 18:08:10 +01:00
Lukas Zielinski 8490e67b02 TRACKING APP: fix hard-coded strings, bugzilla #2532 2014-12-22 17:44:54 +01:00
Lukas Zielinski 130d0ba9ee TRACKING APP: fix hard-coded strings, bugzilla #2532 2014-12-22 17:44:54 +01:00
Lukas Zielinski 2d67baa49e TRACKING APP: Updated text, bugzilla #2528 2014-12-22 11:58:15 +01:00
Lukas Zielinski 7b3b1fdec5 TRACKING APP: Updated text, bugzilla #2528 2014-12-22 11:58:15 +01:00
jan 77abac60cc Improve UX of Tracking Prototype 2014-12-20 11:30:10 +01:00
Lukas Zielinski 80ec60fe1a TRACKING APP: layout 2014-12-18 18:24:00 +01:00
Lukas Zielinski 8f97af4903 TRACKING APP: layout 2014-12-18 18:24:00 +01:00
Lukas Zielinski d0bc0de0f0 TRACKING APP: get flag images from the server 2014-12-17 18:39:15 +01:00
Lukas Zielinski 58381c3744 TRACKING APP: get flag images from the server 2014-12-17 18:39:15 +01:00
Lukas Zielinski 74f70d235a TRACKING APP: supporting different font sizes 2014-12-17 16:47:14 +01:00
Lukas Zielinski ab5c97c3ab TRACKING APP: supporting different font sizes 2014-12-17 16:47:14 +01:00
Lukas Zielinski ab5c0a4c0e TRACKING APP: fix cut off text rendering 2014-12-17 13:48:21 +01:00
Lukas Zielinski 05b41a0c0b TRACKING APP: fix cut off text rendering 2014-12-17 13:48:21 +01:00
Lukas Zielinski aff95cdd54 TRACKING APP: layout 2014-12-17 13:15:07 +01:00
Lukas Zielinski a91ce52ed8 TRACKING APP: layout 2014-12-17 13:15:07 +01:00