Commit Graph
3119 Commits
Author SHA1 Message Date
Axel Uhl 4b4d9780ec added missing abort of race if it doesn't depend on anything
Change-Id: I4ce4d3aab9bb64b2a784131644612ae36a985ca3
2016-04-06 18:43:06 +02:00
Axel Uhl 2db28920d9 collect actions for race abortion in first pass; execute them in second pass
Change-Id: I6e85536b5635af75b879779af0f52416ed829605
2016-04-06 18:23:47 +02:00
Axel Uhl 77698101bd untested, experimental update to abortRunningRaces
Change-Id: Iac7c757ab866b6036df3bf562e813025e542e636
2016-04-06 16:39:37 +02:00
Axel Uhl 30e811f7e9 renamed StartTimeFinderResult.dependingOnRaces
Change-Id: Id5746bba4ead50dc23e23c1c2350a11843419bf5
2016-04-06 16:02:43 +02:00
Axel Uhl 232a8a162a Merge branch 'master' into ubilabs--rcapp--bug-3148
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml

Change-Id: Ibb0d709e9e6c39e915faf2cf568f4ea85853993f
2016-04-06 15:05:27 +02:00
Peter Siegmund f77ed4e89e show "running" races instead of dependent races in race selection and abort the correct races 2016-04-06 14:45:07 +02:00
Axel Uhl 5fb1eed3c1 removed obsolete comment
Change-Id: I521f052b08f555fa1df199b8e06ade6f3e9eca3c
2016-04-06 14:21:44 +02:00
Axel Uhl fb7f615a88 URL-encode the competitorId parameter so as to allow competitor names that contain what is a special character for a path-encoded param
Change-Id: Ibd437ce57c8d7612a91d8b0944e20be168e20c9f
2016-04-06 14:20:49 +02:00
Axel Uhl 42b691d903 minor code simplification
Change-Id: I4dd7e6dadd51755b60ee30b8c5e391dd666b2954
2016-04-05 18:13:48 +02:00
Axel Uhl a900b37632 Merge branch 'master' into ubilabs--rcapp--develop 2016-04-05 18:09:12 +02:00
Axel Uhl e79441408f fixed BitmapHelper import after merge
Change-Id: I19152ff089e33357112ac74920ef6f656f676820
2016-04-05 15:57:16 +02:00
Axel Uhl b35dc6cd10 Merge branch 'master' into ubilabs--tracking_app--develop--bugfix-3567-outofmemoryerror
Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BitmapHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java

Change-Id: I33297ab89503941afd868cf396eae7309daced25
2016-04-05 15:43:33 +02:00
Teresa Holfeld 667931a3f1 Set image after width and height calculation have been done 2016-04-05 14:59:48 +02:00
Steffen Tobias Wagner (D059727) 8bfaa07334 Merge branch 'master' into ubilabs--rcapp--bug-3555 2016-04-05 12:58:44 +02:00
Peter Siegmund b497f6ef83 change setting title 2016-04-05 12:44:08 +02:00
Teresa Holfeld 7a573fd7a4 Delete old BitmapHelper, use new BitmapHelper instead 2016-04-05 12:34:23 +02:00
Teresa Holfeld 21317cef6f Use new BitmapHelper to decode Bitmap and downsample image to required size 2016-04-05 12:18:52 +02:00
Peter Siegmund 95a46a2969 hide race list editing from race summary screen (if not allowed in setting) 2016-04-05 11:34:22 +02:00
Peter Siegmund acb1da80fd show race result list while finishing phase, if activated in preferences - default: false 2016-04-05 11:15:01 +02:00
Peter Siegmund 024a2ebf20 Merge branch 'master' into ubilabs--rcapp--develop 2016-04-05 10:03:52 +02:00
Peter Siegmund ac604fa9b4 added build.info to gitignore 2016-04-05 09:59:12 +02:00
Peter Siegmund 7f8405326c revert build.info 2016-04-05 09:55:05 +02:00
Steffen Tobias Wagner (D059727) 0bac38a631 fixing partly bug 3558 by better evaluating checkIn URL regarding the http/https protocol 2016-04-04 21:20:19 +02:00
Peter Siegmund 4f4dff2132 hide (visibility = GONE) second line in header, if length == 0 2016-04-04 10:34:48 +02:00
Peter Siegmund 5acf7fcd70 added ellipsize at end (and replaced singleLine) into race list (NavDrawer) 2016-04-04 10:27:39 +02:00
Peter Siegmund 4806798c00 check if fragment is added (getActivity != null) in IntentReceiver 2016-04-04 10:05:54 +02:00
Peter Siegmund 43642940ab SAP Maps API Key for Buoy Pinger App
(and fixing packageName for build with gradle)
2016-04-04 08:59:19 +02:00
Peter Siegmund a23970af1e Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop 2016-04-01 15:19:48 +02:00
Peter Siegmund ff495ff1db Race Manager must be able to manage non-public events 2016-04-01 10:48:17 +02:00
Axel Uhl 1beee8dcc4 Merge branch 'master' into ubilabs--rcapp--develop 2016-04-01 00:57:58 +02:00
Axel Uhl d62104d7b0 in preparation of a solution to bug 3358, added FIELD_TEAM_IMAGE_URI to CompetitorsResource output document 2016-04-01 00:47:54 +02:00
Axel Uhl 3f34f84b0c fixed generics warnings by adding type param to NaturalNamedComparator and using consistenly
Change-Id: I69376b70953d0b6b4aeb0cefdeaceabb9dc4321d
2016-03-31 21:59:17 +02:00
Axel Uhl 7916b4af6e Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop 2016-03-31 21:51:09 +02:00
Axel Uhl 7e35bce79d removed unused code
Change-Id: Ib8ee0bb9d4a07e3804c1494b6a90f550e84187d5
2016-03-31 16:41:07 +02:00
Axel Uhl 94ebfe7e84 consolidated imports and cleaned up a few obsolete comments
Change-Id: I10c30b2396e42ec0c20a13a2952e3d86876248b6
2016-03-31 16:38:25 +02:00
Axel Uhl 8c24213d1f removed a merge accident around RaceGroupSeriesFleet
Change-Id: I91a3a0bebdf5a5989e9b3e5f142b50c1f48bf870
2016-03-31 16:37:43 +02:00
Axel Uhl dfa5b10500 Merge remote-tracking branch 'server/master' into ubilabs--tracking_app--develop 2016-03-31 16:11:55 +02:00
Peter Siegmund ead4783897 sapsailing.com is now clickable in about dialog 2016-03-30 14:54:32 +02:00
Axel Uhl 461e08a0a8 moved serialized to .android.shared so Buoy Pinging app can see them
Change-Id: I52ebc9fa121b6223575f746bd90a723175b8d491
2016-03-30 13:42:25 +02:00
Bennet Brunsen e328de4f68 Changed text in about fragment 2016-03-29 11:58:52 +02:00
Peter Siegmund 87ad82a08c moved larger backdrop image to sw700dp, because sw600dp (e.g. Nexus 7 2012) can't show it 2016-03-24 12:53:57 +01:00
Bennet Brunsen eac257c3ba Remove border in settings dialog for pre 21 devices 2016-03-24 12:46:20 +01:00
Peter Siegmund 94de27486f increased "running time" area size on phones (because of the update badge) 2016-03-24 12:04:19 +01:00
Peter Siegmund 9dc7115921 show dependent race for selection and abort race/hardened start time 2016-03-24 12:03:56 +01:00
Peter Siegmund 35de1b61b0 refactor multiple wind input dialog 2016-03-24 10:32:43 +01:00
Peter Siegmund 9193f6c6ad increased "running time" area size on phones (because of the update badge) 2016-03-23 12:26:27 +01:00
Peter Siegmund 85cad41f9e Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3148 2016-03-23 12:11:12 +01:00
Peter Siegmund d2d35353df decreased "running time" area size on phones 2016-03-23 12:10:52 +01:00
Peter Siegmund c503a8edd6 fixed dependent start time panel text (into "short reverse") 2016-03-23 12:09:38 +01:00
Peter Siegmund 97e4a5dcb9 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3148 2016-03-23 11:34:23 +01:00