Commit Graph
202 Commits
Author SHA1 Message Date
Peter Siegmund 44752010e6 extracted gradle dependency versions into the root build.gradle file (one place for all sub modules) 2015-06-26 15:17:00 +02:00
Peter Siegmund ec89a57255 Merge branch 'master' into ubilabs--rcapp--master 2015-06-25 20:46:01 +02:00
Jan Broß f9b06480b6 Fix debug output of buoy tender app 2015-06-24 17:46:27 +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
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
Peter Siegmund 35fc63fd2b Merge branch 'master' into ubilabs--rcapp--develop 2015-06-16 11:03:35 +02:00
Peter Siegmund 7092a5c22f Hotfix to be able to start the old RCApp without crashes 2015-06-12 15:15:47 +02:00
Samuel Oey bcbf8a89ab adds some more logging to the sending service layer 2015-06-12 09:26:24 +02:00
Peter Siegmund 3f8c8fbdec Bug 2875 - Force Close while fast wind fragment switching 2015-06-02 11:00:55 +02:00
Peter Siegmund dd546feaa5 RCApp: removed warnings 2015-06-01 14:25:18 +02:00
Axel Uhl 34f34ee940 Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into yes2015 2015-05-24 07:58:14 +02:00
Axel Uhl bbfd74a847 consolidated imports 2015-05-23 16:12:35 +02:00
Peter Siegmund 612191da42 RCApp: fixed RuntimeException while start SendingService 2015-05-23 12:38:09 +02:00
Axel Uhl 777a96aeb8 Merge branch 'yes2015' into yes2015-with-design2015; removed unused MediaType.image and MediaType.unknown enum literals again for now
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2015-05-22 19:07:08 +02:00
Peter Siegmund 30bdd66bb3 remove eclipse warnings 2015-05-22 15:23:32 +02:00
Axel Uhl 0f4cf8a856 trying to avoid some warnings, removing unused imports and fields 2015-05-22 12:30:32 +02:00
Peter Siegmund e3a05f59b4 Updated Play Services to version 7.3 and external libs for Eclipse build 2015-05-06 13:47:23 +02:00
Peter Siegmund e8feee3df4 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-06 11:32:59 +02:00
Peter Siegmund ffc96c2308 Removed BaseActivity from Android Shared 2015-05-06 08:57:19 +02:00
Bennet Brunsen 3123d4210a revert some more whitespace changes 2015-04-30 15:52:54 +02:00
Bennet Brunsen 639d109e39 Revert "adding white space mess "
This reverts commit ec12301feee614dc356732850564b754e0bfc33a.
2015-04-30 11:54:47 +02:00
Peter Siegmund 9cef6598f2 RCApp: redesigned NavDrawer (again with headers) 2015-04-27 12:39:41 +02:00
Bennet Brunsen 33d5c9a167 Applied code formatting to android shared project.
Applied sap eclipse code formatter android shared project.
2015-04-24 11:11:32 +02:00
Bennet Brunsen b20d4edb26 Changed 'about' string in EN. 2015-04-24 10:06:07 +02:00
Peter Siegmund b45da62992 new external project (advrecyclerview) for eclipse - do not use with gradle build 2015-04-24 08:03:43 +02:00
Bennet Brunsen f426946c59 Fixes missing translation of bug 2761 2015-04-23 11:11:33 +02:00
Peter Siegmund 4bfacec822 RCApp: new Android Support Library 22.1 and new Material Design AlertDialog (not everywhere replaced yet) 2015-04-22 12:50:05 +02:00
Bennet Brunsen 8626f67187 Applied code formatting.
Used code formatter provided by Siegmund. Applied code formatting to
tracking app, buoy positioning app, android shared.
2015-04-16 11:16:11 +02:00
Peter Siegmund bc29019a1e RCApp: show build information (branch, git-hash and timestamp) in technical information screen 2015-04-07 11:23:09 +02:00
Bennet Brunsen 6d1525e92f Implements: About dialog containing git commit information 2015-03-31 17:23:37 +02:00
Peter Siegmund 05d8940c89 Gradle: create build info in assets folder while build - no compile error within Eclipse - with helper function in AppUtils 2015-03-31 15:55:38 +02:00
Peter Siegmund 99d767d1b0 Gradle: create build info in assets folder while build - no compile error within Eclipse - with helper function in AppUtils 2015-03-31 15:54:23 +02:00
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
Peter Siegmund deb29d5b4e Merge branch 'ubilabs--rcapp--espresso-testing' into ubilabs--rcapp--develop 2015-03-25 10:54:04 +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
Peter Siegmund 4c5eac1a00 Gradle: updated build tools version 2015-03-24 15:33:24 +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
Peter Siegmund 03f80d80c5 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-20 09:23:39 +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