Commit Graph
32176 Commits
Author SHA1 Message Date
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 ad5c6692b5 changed ignore syntax for build.info files
Change-Id: I2688d3cd171c8101f55ce706f4c5e6c6bb927cce
2016-04-15 09:16:45 +02:00
Peter Siegmund e12f586a68 fixed clickable link (part 2) 2016-04-15 09:12:26 +02:00
Peter Siegmund e602c5b374 fixed clickable link 2016-04-15 09:01:24 +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
Axel Uhl 1070cece12 Merge remote branch 'origin/master' 2016-04-15 06:21:13 +02:00
Axel Uhl 2dcfe13d97 Merge remote branch 'origin/bug3599' 2016-04-15 06:18:09 +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
Peter Siegmund c08055096a new Android Studio release (Android Studio 2.1 Beta) 2016-04-15 00:41:42 +02:00
Axel Uhl c8accfd1f8 Merge remote-tracking branch 'server/master' 2016-04-14 23:14:26 +02:00
Axel Uhl a2176d0bc5 fixed generation of app names in invitation e-mails
Change-Id: I7655edbb636b8bb9016b71d50fee1561585d3fc1
2016-04-14 23:12:06 +02:00
Steffen Tobias Wagner a6f4f9e397 added mail relaying section 2016-04-14 19:37:46 +00:00
Steffen Tobias Wagner 18f2449958 added link to mail relaying 2016-04-14 18:02:02 +00:00
Steffen Tobias Wagner 437b0e1204 added mail relaying setup 2016-04-14 18:01:12 +00:00
Steffen Tobias Wagner 040288e17b Destroyed Mail relaying (markdown) 2016-04-14 18:00:48 +00:00
Steffen Tobias Wagner 4a84e8559c added mail relay setup 2016-04-14 18:00:23 +00:00
Axel Uhl 63ecb41944 fixed bug3599, tests now pass
Change-Id: Ifffdc82c0b8705440de635c48ce4b90571cb0096
2016-04-14 19:04:14 +02:00
Axel Uhl 30b5b08017 added failing replication test case for bug3599
Change-Id: I68e9ff67e04d109dee547b4d3c9f75b75eed3b7d
2016-04-14 18:59:15 +02:00
Axel Uhl 8781eefbeb added second fialing test case for user store
Change-Id: Iaaa502113b89689aac04267fe5ea158230d5cee4
2016-04-14 18:41:33 +02:00
Axel Uhl 426a944f3b first failing test case that shows that the UserStore doesn't clear the userByAccessToken structure in its clear() method
Change-Id: Id93bdbcc16a6f94c08547fa596685dfbe04cdb8a
2016-04-14 18:30:55 +02:00
Axel Uhl e1e5054e32 started adding a failing test case for bug3599 2016-04-14 18:22:54 +02:00
Axel Uhl a60ca6ff8c fixed minute display for wind status servlet 2016-04-14 16:32:25 +02:00
Axel Uhl 43a391713d fixed wind status servlet time lag output (s instead of min) 2016-04-14 16:16:18 +02:00
Peter Siegmund 733c619817 added missing import 2016-04-14 11:57:03 +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 27830c79be Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop 2016-04-14 10:17:07 +02:00
Peter Siegmund 3dfe219137 set factor fragment 2016-04-14 10:16:14 +02:00
Peter Siegmund 938affccea new Android Studio release (Android Studio 2.1 Beta) 2016-04-14 09:33:42 +02:00
Axel Uhl b7b255f68d using the generalized string list composite widget for CourseAreaDTO editing in the context of events, fixing bug 3594
Change-Id: I60e4fa152806bdc41089d478ae738ba722c45a45
2016-04-14 00:20:01 +02:00
Axel Uhl 4567fc5911 adjusted uses of string list editor to genericity of new implementation
Change-Id: I1b91d446636a9cf2a7cf4c4fc712c447ab609bd0
2016-04-13 23:43:12 +02:00
Axel Uhl b821909745 attempting to make the StringListComposite editor more generic so that it can handle, e.g., CourseAreaDTO objects
Change-Id: Ia3921c9b51776be2ebf6d0b2ad0b9eb4a6779394
2016-04-13 23:30:48 +02:00
Axel Uhl 45bd06036c Merge branch 'master' into bug3594 2016-04-13 22:02:59 +02:00
Axel Uhl b08b718886 added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267
Change-Id: I55b343e2447c2837ce678dbc32e1921ce9a2ffa9
2016-04-13 21:56:52 +02:00
Axel Uhl 1a09fe2d00 use course area ID in regatta dialogs in course area lists as values to match against
Change-Id: I20b6380ac72c0e30cb632f1aec0a174dd2ee63e5
2016-04-13 21:27:31 +02:00
fmittag 463204e189 added TLE (Time limit Expired) as new MaxPointReason used at the CRW 2016 (see sailing instructions) 2016-04-13 15:07:50 -04:00
fmittag 8c3f7096c3 added white as possible fleet color for the CRW 2016-04-13 14:54:54 -04:00
Steffen Tobias Wagner (D059727) 9d51ea2f60 Merge branch 'bug3512_crw_boatclasses' 2016-04-13 19:41:05 +02:00
Steffen Tobias Wagner (D059727) cb60c6ddee changed PHRF boat class image to official USSailing 2016-04-13 19:39:37 +02:00
Axel Uhl eb947d494b use CourseAreaDTO.id in FlexibleLeaderboardDialog to match course area selection
Change-Id: Ic02057b571a6168cf3821510c89b9c53f5174a66
2016-04-13 18:43:34 +02:00
Peter Siegmund 9bc16bc182 Context has always to be the first param 2016-04-13 17:04:40 +02:00
Axel Uhl b29d68e312 Merge branch 'master' into crw2016 2016-04-13 16:36:12 +02:00
Benjamin Barth 108b097061 Avoided disabled leaderboard links in multi-regatta event overviews 2016-04-13 16:20:13 +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 8978e2d0e3 Merge branch 'bug3589' 2016-04-13 08:31:13 +02:00
Axel Uhl 4006b5e073 Merge branch 'master' into crw2016 2016-04-12 17:04:57 +02:00
Axel Uhl 84fbd8d6e0 As fix for bug 3589, added MailServiceResolver and use ObjectInputStreamResolvingAgainstCache which respects Thread's context class loader
Change-Id: I498624382678929da138d01ff5802f4a44851f44
2016-04-12 10:44:57 +02:00