eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 01:59:35 +00:00
Code Activity
22,462 Commits 284 Branches 273 Tags
1e413fc1d164862c0ed91abd5cfa5c8b553ea5f0
Commit Graph
108 Commits
Author SHA1 Message Date
Axel Uhl 44def3c6c6 Merge remote-tracking branch 'server/ubilabs--buoy_positioning_app--develop' into ubilabs--buoy_positioning_app--develop 
Conflicts:
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java
 2015-03-30 17:26:38 +02:00
Bennet Brunsen c8a0a26ecb Removes Hockey SDK 2015-03-30 14:24:03 +02:00
Bennet Brunsen f9715d2790 Merge branch 'ubilabs--buoy_positioning_app--bugfix--ui_improvements' into ubilabs--buoy_positioning_app--develop 
Conflicts:

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy
/positioning/app/ui/activities/RegattaActivity.java
 2015-03-27 15:37:08 +01:00
Bennet Brunsen 0b4d72be0e Implements refresh function for marks on new checkin and inside RegattaActivity 2015-03-27 15:27:19 +01:00
Bennet Brunsen 3b92d17106 UI improvements 2015-03-27 12:24:26 +01:00
Bennet Brunsen bb8533dfc6 Bugfixes, layout improvements, initial code for map 2015-03-26 12:31:04 +01:00
Axel Uhl a3403881a1 removed Hockey dependency; removed Volley from pom.xml; added org.json.simple dependency 2015-03-25 21:01:19 +01:00
Axel Uhl ca254c72e3 Merge branch 'master' into ubilabs--buoy_positioning_app--develop 
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT sdm.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT.launch
 2015-03-24 20:37:36 +01:00
Bennet Brunsen 19a00d5dc9 Fixed build errors 2015-03-24 15:18:39 +01:00
Bennet Brunsen ee3437bb5d Buoyfragment pings marks now 2015-03-24 14:03:20 +01:00
Bennet Brunsen 70cb734532 First draft of Positioning Acitivity 2015-03-23 18:12:50 +01:00
Bennet Brunsen 23e539d720 First draft of local database 2015-03-21 18:56:58 +01:00
Bennet Brunsen dee326c71c Implemented StartActivity and partially HomeFragment 
Implemented StartActivity and partially HomeFragment. Additional
extractions.
 2015-03-19 15:56:31 +01:00
Bennet Brunsen 08feaf3042 Merge branch 'ubilabs--tracking_app--refactor--extract_shared_components' into ubilabs--buoy_positioning_app--develop 2015-03-19 10:31:29 +01:00
Bennet Brunsen 771f3cf69f Fix for NPE 2015-03-19 10:15:35 +01:00
Bennet Brunsen 53f2468971 Second extraction 2015-03-18 17:25:23 +01:00
fmittag d44621c170 added 'com.sap.sse.shared.android' project to maven build dependencies for apk build 2015-03-18 11:49:45 +01:00
Peter Siegmund ea03e558e0 Update to targetApi 22 2015-03-17 12:31:58 +01:00
Bennet Brunsen d8a2712b3e First Extraction 
First classes extracted and moved to shared. Not final!
 2015-03-12 18:18:04 +01:00
Axel Uhl d8688730fc fixed formatting of MessageSendingService 2015-03-04 18:06:38 +01:00
Axel Uhl 90aea775b8 avoid warnings in android.shared project 2015-03-04 17:56:56 +01:00
Axel Uhl 6d9864930e re-formatted code 2015-03-04 17:02:54 +01:00
Axel Uhl 0c26b2924b removed unused method 2015-03-04 17:01:46 +01:00
Fredrik Teschke 9c375a3ae4 Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes 
Conflicts:
	.gitignore
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
 2015-02-13 11:16:50 +01:00
Peter Siegmund cca54ea5d8 Android apps can be compiled within Eclipse 2015-02-10 09:20:42 +01:00
Simon Pamies 526f46ddf9 Fixed wrong encoding in MessageSendingService 2015-02-04 17:45:22 +08:00
Axel Uhl 8583bbc0ce added com.sap.sse.shared.android to list of exports of mobile shared.android project 2015-02-04 09:32:11 +01:00
Axel Uhl 57a3d86272 added project dependency from com.sap.sailing.android.shared to com.sap.sse.android.shared 2015-02-04 08:40:11 +01:00
Fredrik Teschke 9a5fd4ac36 removing discrepancies to master (old 1.6 android compiler settings somehow appeared) 2015-01-23 20:09:53 +01:00
jan 9900c28ae6 Merge remote-tracking branch 'origin/ftes-file-storage' into jan-team-image 
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TeamResource.java
 2015-01-23 14:08:51 +01:00
Peter Siegmund a8aaab17e4 RCApp: none blocking lint errors in RCApp anymore 2015-01-23 11:21:58 +01:00
Peter Siegmund c72b4c0e61 Wrong encoding... 2015-01-21 16:26:31 +01:00
Peter Siegmund d8f304039f Merge branch 'master' into android_apps 2015-01-21 15:20:56 +01:00
Axel Uhl e9efc2df7e Merge branch 'master' into ftes-android-4.4 
Conflicts:
	mobile/com.sap.sailing.android.shared/.settings/org.eclipse.jdt.core.prefs
 2015-01-20 11:30:41 +01:00
Peter Siegmund 5cf54de9a5 removed Lint errors in Android Shared 2015-01-20 09:34:52 +01:00
Peter Siegmund dba8c6c8a1 Gradle: all Android debug build will be signed with the STG-debug key 2015-01-19 19:41:40 +01:00
Peter Siegmund a8bac028f6 Gradle: changed to local json-simple module 2015-01-16 16:03:40 +01:00
Peter Siegmund 284a38698b Gradle: create and clean version file for Android apps into www/apps folder 2015-01-16 12:26:18 +01:00
Peter Siegmund 16fb8640f7 Gradle: clean and copies apk files into www/apps folder 2015-01-16 11:38:46 +01:00
Peter Siegmund b3981260c2 Merge branch 'android_apps_tracking' into android_apps 2015-01-15 15:32:10 +01:00
Peter Siegmund c580c10f89 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Lukas Zielinski b39edc3cd7 TRACKING APP: nothing, cleanup 2015-01-14 16:46:03 +01:00
Axel Uhl 23edcf21c8 adjusted pom.xml dependency in com.sap.sailing.android.shared to com.sap.sailing.server.gateway.serialization.shared.android 2015-01-14 14:32:19 +01:00
Axel Uhl 8ee256a4b7 split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572 2015-01-14 13:22:22 +01:00
Lukas Zielinski ab65f39b6c TRACKING APP: connectivity reporting and cleanup 2015-01-13 16:57:22 +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
Lukas Zielinski 2c64c27a18 TRACKING APP: refactoring back to old message sending service 2015-01-12 18:15:32 +01:00
Lukas Zielinski 78a94b7efb TRACKING APP: refactoring back to old message sending service 2015-01-12 16:20:17 +01:00
Lukas Zielinski 634c03e045 TRACKING APP: refactoring back to old message sending service 2015-01-12 16:20:03 +01:00
Fredrik Teschke 03b59db67f really changed android target to 4.4 in POMs (was 4.0 before) 2015-01-11 20:06:45 +01:00