eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity
32,584 Commits 284 Branches 275 Tags
b2c07ce9454d06ceb68015120ab31847bfec7c5d
Commit Graph
2185 Commits
Author SHA1 Message Date
Peter Siegmund 44bb552661 Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop 2016-04-18 22:17:21 +02:00
Peter Siegmund f2df9d96ba fixed ConcurrentModificationException 2016-04-18 22:16:34 +02:00
Peter Siegmund 7ea37257d3 Merge branch 'ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop 2016-04-18 21:46:58 +02:00
Peter Siegmund 6e8137628b set text color with fixed value from custom style (because of API <= 19) 2016-04-18 21:45:36 +02:00
Peter Siegmund 821ad4ac18 Merge branch 'ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop 2016-04-18 18:59:42 +02:00
Peter Siegmund b98ffe6568 removed unused translation 2016-04-18 18:59:16 +02:00
Peter Siegmund 55f956db9b removed unused method 2016-04-18 18:58:41 +02:00
Axel Uhl 5b2d063c40 added missing imports for ViewCompat 
Change-Id: I6986902e1d5870477e0883d43ac8a62861a2d95a
 2016-04-18 18:44:38 +02:00
Axel Uhl 1e3a282461 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop 
Conflicts:
	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/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/data/OnlineDataManager.java

Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e
 2016-04-18 17:48:32 +02:00
Axel Uhl d88852ac3b Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3595' into ubilabs--rcapp--develop 2016-04-18 17:45:36 +02:00
Axel Uhl 86a63366a2 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop 
Conflicts:
	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/ui/activities/RacingActivity.java

Change-Id: Ibc180ab51e659a0c452d64f1756b5d7008ffbfb6
 2016-04-18 17:35:47 +02:00
Axel Uhl 4ef21a5ccb Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java

Change-Id: I4e741f66667c9946b0aa36e25ea759cce47b9c9d
 2016-04-18 17:31:09 +02:00
Axel Uhl 5f96787626 Merge branch 'master' into ubilabs--rcapp--bug-3595 2016-04-18 17:03:09 +02:00
Peter Siegmund c959e6d069 using MessageSendingService for explicitFactor update 2016-04-15 16:07:06 +02:00
Peter Siegmund a8b318b080 use factor/explicitFactor from RaceCell to instantiate ManagedRace, in order to remove custom loader after login 2016-04-15 15:49:09 +02:00
Axel Uhl 8b5cade99d Merge remote-tracking branch 'server/competitor_searchtag' 2016-04-15 14:29:02 +02:00
Axel Uhl 9241bac1b2 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3598 2016-04-15 11:04:24 +02:00
Axel Uhl 7cde171906 Revert "fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName"; 
is now on branch ubilabs--rcapp--bug-1267

This reverts commit 24afb859f6.
 2016-04-15 11:01:59 +02:00
Axel Uhl d3b620475e Revert "renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer"; 
is now on branch ubilabs--rcapp--bug-1267

This reverts commit 4006732304.
 2016-04-15 11:01:22 +02:00
Axel Uhl b18057c2c0 Revert "renamed accessor method for mCourseAreaContainer"; this contribution is now on branch ubilabs--rcapp--bug-1267 
This reverts commit 9f7277580b.
 2016-04-15 11:00:50 +02:00
Axel Uhl 5244f988e5 Revert "removed obsolete comment" 
This reverts commit 0b2f1f327f.
 2016-04-15 11:00:33 +02:00
Axel Uhl 349b9c7d70 removed obsolete comment 
Change-Id: I7e148a560828c2d6b530f338798a8765551a676a
 2016-04-15 10:54:49 +02:00
Axel Uhl 5b35d2a75c renamed accessor method for mCourseAreaContainer 
Change-Id: I9d8610d9f0c8dd0d8461bd3552ab81a0d909b907
 2016-04-15 10:54:23 +02:00
Axel Uhl ca7c590c53 renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer 
Change-Id: Ie4c495e1ffb8907798c9ebefe1eb3a506582e2a2
 2016-04-15 10:54:13 +02:00
Axel Uhl b7b12f4b2d fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName 
Change-Id: I80156bdbef120b6c70bdd18e8be14facbe4a4b82
 2016-04-15 10:53:01 +02:00
Axel Uhl b41035e067 fixed imports after merge; added a TODO for unused method initFactor in MainScheduleFragment 
Change-Id: I12bf0d8333b579f39719966abf98445eb3a0aad0
 2016-04-15 10:51:32 +02:00
Axel Uhl 5a75caf0f5 Merge branch 'master' into ubilabs--rcapp--bug-1267 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: I5fa5dce7ca0cbb7d7b4c7804fe010b7200b64bf3
 2016-04-15 10:49:18 +02:00
Axel Uhl e371774f99 Merge branch 'master' into ubilabs--rcapp--bug-3598 2016-04-15 09:34:13 +02:00
Peter Siegmund bffc893390 reverted build.info checkin from 118ffa2 2016-04-15 08:35:49 +02:00
Axel Uhl 118ffa2b25 added missing translations for Android 
Change-Id: I05eedd7b0574aa4d370fa4da946fbfb9ed74d18a
 2016-04-15 08:07:58 +02:00
Axel Uhl 3de80cd641 fix attempt for bug 3601: using ViewCompat.getMinimumWidth/Height to avoid NoSuchMethodError on older API levels 
Change-Id: I4a1eff2e7eead08617719c15e6a31e7df97ec616
 2016-04-15 07:39:31 +02:00
Peter Siegmund 8547310174 artificial delay (to prevent "java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState") -> bug 3600 2016-04-15 00:57:44 +02:00
Peter Siegmund 8de1df132d forced to use Activity FragmentManager (instead of ChildFragmentManager) -> could fix bug 3600 2016-04-15 00:54:35 +02:00
fmittag ef7d84bd81 added a searchTag attribute to 'Competitor' to make it possible to 'tag' competitors for an easier search later on 2016-04-14 13:44:37 -04:00
Bennet Brunsen 6bce3c8c32 Don't reset data after activity reactivation 2016-04-14 16:22:07 +02:00
Peter Siegmund a5f2f6c6e7 course areas can be disabled in login selection in the backend again 2016-04-14 15:52:21 +02:00
Bennet Brunsen d125711e16 Disable login button in on resume 2016-04-14 15:19:50 +02:00
Axel Uhl 0b2f1f327f removed obsolete comment 
Change-Id: I7e148a560828c2d6b530f338798a8765551a676a
 2016-04-14 11:13:32 +02:00
Axel Uhl 9f7277580b renamed accessor method for mCourseAreaContainer 
Change-Id: I9d8610d9f0c8dd0d8461bd3552ab81a0d909b907
 2016-04-14 11:12:25 +02:00
Axel Uhl 4006732304 renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer 
Change-Id: Ie4c495e1ffb8907798c9ebefe1eb3a506582e2a2
 2016-04-14 11:11:24 +02:00
Axel Uhl 24afb859f6 fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName 
Change-Id: I80156bdbef120b6c70bdd18e8be14facbe4a4b82
 2016-04-14 11:08:45 +02:00
Peter Siegmund 99ecc950cb Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-1267 2016-04-14 10:17:33 +02:00
Peter Siegmund 3dfe219137 set factor fragment 2016-04-14 10:16:14 +02:00
Axel Uhl 6e1865f0f7 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-14 10:11:35 +02:00
Peter Siegmund 9bc16bc182 Context has always to be the first param 2016-04-13 17:04:40 +02:00
Peter Siegmund d3496f8d77 disabled checkForUpdate for non-sideloaded apps 2016-04-13 15:15:30 +02:00
Peter Siegmund 61089e2b83 load race column factors at login 2016-04-13 15:12:19 +02:00
Axel Uhl 362041877a upgraded AndroidManifest.xml versions of apps 
Change-Id: I1010248d7b6f78d905f3e695b832691982e71612
 2016-04-13 14:59:33 +02:00
Axel Uhl 575d373a22 whitespace, formatting and commet changes; made one method private 
Change-Id: Ibb102cec17f2f848f21235e18e66d58383990e98
 2016-04-13 08:30:55 +02:00
Axel Uhl babdcbe68c Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-12 12:44:53 +02:00